0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

in video editor, pass position along with in and out when triggering a point event

Browse source
This commit is contained in:
rlx 2012-04-22 08:54:44 +00:00
parent 96d5e4a856
commit bdab9b8a7d
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/Ox.UI/js/Video/Ox.VideoEditor.js
View file

@ -74,7 +74,9 @@ Ox.VideoEditor = function(options, self) {
key_alt_shift_right: function() { key_alt_shift_right: function() {
}, },
key_b: function() { key_b: function() {
self.annotations.length && selectAnnotation(getNextAnnotation('annotation', -1)); self.annotations.length && selectAnnotation(
getNextAnnotation('annotation', -1)
);
}, },
key_backslash: function() { key_backslash: function() {
self.annotations.length && selectAnnotation(); self.annotations.length && selectAnnotation();
@ -118,7 +120,9 @@ Ox.VideoEditor = function(options, self) {
}); });
}, },
key_g: function() { key_g: function() {
self.results.length && selectAnnotation(getNextAnnotation('result', 1)); self.results.length && selectAnnotation(
getNextAnnotation('result', 1)
);
}, },
key_h: showKeyboardShortcuts, key_h: showKeyboardShortcuts,
key_i: function() { key_i: function() {
@ -131,7 +135,9 @@ Ox.VideoEditor = function(options, self) {
self.$player[0].changeVolume(-0.1); self.$player[0].changeVolume(-0.1);
}, },
key_n: function() { key_n: function() {
self.annotations.length && selectAnnotation(getNextAnnotation('annotation', 1)); self.annotations.length && selectAnnotation(
getNextAnnotation('annotation', 1)
);
}, },
key_o: function() { key_o: function() {
setPoint('out', self.options.position); setPoint('out', self.options.position);
@ -153,7 +159,9 @@ Ox.VideoEditor = function(options, self) {
self.options.videoSize == 'small' && toggleSize(); self.options.videoSize == 'small' && toggleSize();
}, },
key_shift_g: function() { key_shift_g: function() {
self.results.length && selectAnnotation(getNextAnnotation('result', -1)); self.results.length && selectAnnotation(
getNextAnnotation('result', -1)
);
}, },
key_shift_left: function() { key_shift_left: function() {
movePositionBy(-1); movePositionBy(-1);
@ -1123,7 +1131,8 @@ Ox.VideoEditor = function(options, self) {
}); });
that.triggerEvent('points', { that.triggerEvent('points', {
'in': self.options['in'], 'in': self.options['in'],
out: self.options.out out: self.options.out,
position: self.options.position
}); });
if (self.editing && self.options.selected[0] != '_') { if (self.editing && self.options.selected[0] != '_') {
that.triggerEvent('editannotation', { that.triggerEvent('editannotation', {