fix seek
This commit is contained in:
parent
0e662dfac5
commit
8e9461865f
2 changed files with 4 additions and 4 deletions
|
@ -8,7 +8,7 @@
|
||||||
<script type="text/javascript" src="js/player.js?2"></script>
|
<script type="text/javascript" src="js/player.js?2"></script>
|
||||||
<script type="text/javascript" src="js/staticfuncs.js?2"></script>
|
<script type="text/javascript" src="js/staticfuncs.js?2"></script>
|
||||||
<script type="text/javascript" src="js/classes.js?2"></script>
|
<script type="text/javascript" src="js/classes.js?2"></script>
|
||||||
<script type="text/javascript" src="js/app.js?3"></script>
|
<script type="text/javascript" src="js/app.js?4"></script>
|
||||||
<script type="text/javascript" src="js/ox.extra.js"></script>
|
<script type="text/javascript" src="js/ox.extra.js"></script>
|
||||||
<script type="text/javascript" src="js/dnd.js"></script>
|
<script type="text/javascript" src="js/dnd.js"></script>
|
||||||
<script type="text/javascript" src="js/error.js?2"></script>
|
<script type="text/javascript" src="js/error.js?2"></script>
|
||||||
|
|
|
@ -45,6 +45,7 @@ Ox.load({
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
var seekTime = parseFloat($('#seekTime').val());
|
||||||
if (navigator.platform == 'MacIntel') {
|
if (navigator.platform == 'MacIntel') {
|
||||||
//Ctrl - Seek Back
|
//Ctrl - Seek Back
|
||||||
if (e.keyCode == 17) {
|
if (e.keyCode == 17) {
|
||||||
|
@ -56,12 +57,12 @@ Ox.load({
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
//PageUp - seek back
|
//PageUp - seek back
|
||||||
if (e.keyCode == 33) {
|
if (e.keyCode == 33 && !e.shiftKey) {
|
||||||
seek(-seekTime)
|
seek(-seekTime)
|
||||||
}
|
}
|
||||||
|
|
||||||
// PageDown - seek fwd.
|
// PageDown - seek fwd.
|
||||||
if (e.keyCode == 34) {
|
if (e.keyCode == 34 && !e.shiftKey) {
|
||||||
seek(seekTime)
|
seek(seekTime)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -331,7 +332,6 @@ function loadVideo(videoFile) {
|
||||||
};
|
};
|
||||||
|
|
||||||
function seek(delta) {
|
function seek(delta) {
|
||||||
var seekTime = parseFloat($('#seekTime').val());
|
|
||||||
var currTime = Video.get();
|
var currTime = Video.get();
|
||||||
var newTime = currTime + delta;
|
var newTime = currTime + delta;
|
||||||
Video.set(newTime);
|
Video.set(newTime);
|
||||||
|
|
Loading…
Reference in a new issue