sanj/oxjs
1
0
Fork 0
forked from 0x2620/oxjs
Code Pull requests Activity

make +/- volume keyboard shortcut work in video and timeline views

Browse source
This commit is contained in:
rlx 2012-02-19 11:21:52 +00:00
commit 7d188d8621
5 changed files with 46 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

17
source/Ox.UI/js/Video/Ox.VideoPlayer.js
View file

@ -191,7 +191,7 @@ Ox.VideoPlayer = function(options, self) {
key_0: toggleMuted,
key_1: toggleScale,
key_equal: function() {
changeVolumeBy(0.1);
changeVolume(0.1);
},
key_escape: hideControlMenus,
key_f: focusFind,
@ -202,7 +202,7 @@ Ox.VideoPlayer = function(options, self) {
setPosition(self.options.position - self.secondsPerFrame);
},
key_minus: function() {
changeVolumeBy(-0.1);
changeVolume(-0.1);
},
key_p: function() {
playInToOut();
@ -1091,7 +1091,7 @@ Ox.VideoPlayer = function(options, self) {
self.$copyrightIcon[self.censored ? 'show' : 'hide']();
}
function changeVolumeBy(num) {
function changeVolume(num) {
showVolume();
self.options.volume = Ox.limit(self.options.volume + num, 0, 1);
setVolume(self.options.volume);
@ -2120,8 +2120,10 @@ Ox.VideoPlayer = function(options, self) {
}
function showVolume() {
!self.interfaceIsVisible && showControls();
self.$volume && self.$volume.is(':hidden') && toggleVolume();
if (self.$volume) {
!self.interfaceIsVisible && showControls();
self.$volume.is(':hidden') && toggleVolume();
}
}
function submitFindInput(value, hasPressedEnter) {
@ -2371,6 +2373,11 @@ Ox.VideoPlayer = function(options, self) {
}
};
that.changeVolume = function(num) {
changeVolume(num);
return that;
};
/*@
playInToOut <f> play in to out
() -> <o> play in to out