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

beginning to fix #318

Browse source
This commit is contained in:
rlx 2012-02-15 22:06:00 +00:00
parent e46b568322
commit c040e48601
3 changed files with 71 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
source/Ox.UI/js/Video/Ox.AnnotationFolder.js
View file

@ -261,8 +261,29 @@ Ox.AnnotationFolder = function(options, self) {
that.triggerEvent('selectnone'); that.triggerEvent('selectnone');
}, },
submit: submitAnnotation, submit: submitAnnotation,
key_b: function() {
that.triggerEvent('key_b');
},
key_equal: function() {
that.triggerEvent('key_equal');
},
key_f: function() {
that.triggerEvent('key_f');
},
key_g: function() {
that.triggerEvent('key_g');
},
key_minus: function() {
that.triggerEvent('key_minus');
},
key_n: function() {
that.triggerEvent('key_n');
},
key_shift_g: function() {
that.triggerEvent('key_shift_g');
},
key_space: function() { key_space: function() {
that.triggerEvent('paused'); that.triggerEvent('key_space');
} }
}) })
.appendTo( .appendTo(

27
source/Ox.UI/js/Video/Ox.AnnotationPanel.js
View file

@ -190,9 +190,6 @@ Ox.AnnotationPanel = function(options, self) {
info: function(data) { info: function(data) {
that.triggerEvent('info', {layer: layer.id}); that.triggerEvent('info', {layer: layer.id});
}, },
paused: function() {
that.triggerEvent('paused')
},
remove: function(data) { remove: function(data) {
that.triggerEvent('remove', Ox.extend({layer: layer.id}, data)); that.triggerEvent('remove', Ox.extend({layer: layer.id}, data));
}, },
@ -221,6 +218,30 @@ Ox.AnnotationPanel = function(options, self) {
that.triggerEvent('toggle' + ( that.triggerEvent('toggle' + (
layer.type == 'event' ? 'calendar' : 'map' layer.type == 'event' ? 'calendar' : 'map'
), data); ), data);
},
key_b: function() {
that.triggerEvent('key_b');
},
key_equal: function() {
that.triggerEvent('key_equal');
},
key_f: function() {
that.triggerEvent('key_f');
},
key_g: function() {
that.triggerEvent('key_g');
},
key_minus: function() {
that.triggerEvent('key_minus');
},
key_n: function() {
that.triggerEvent('key_n');
},
key_shift_g: function() {
that.triggerEvent('key_shift_g');
},
key_space: function() {
that.triggerEvent('key_space');
} }
}) })
.appendTo(self.$folders); .appendTo(self.$folders);

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

@ -128,7 +128,7 @@ Ox.VideoEditor = function(options, self) {
self.options.videoSize == 'large' && toggleSize(); self.options.videoSize == 'large' && toggleSize();
}, },
key_n: function() { key_n: function() {
self.annotations.length && selectAnnotation(getNextAnnotation('annotation', 1), true); self.annotations.length && selectAnnotation(getNextAnnotation('annotation', 1));
}, },
key_o: function() { key_o: function() {
setPoint('out', self.options.position); setPoint('out', self.options.position);
@ -620,7 +620,6 @@ Ox.VideoEditor = function(options, self) {
info: function(data) { info: function(data) {
that.triggerEvent('info', data); that.triggerEvent('info', data);
}, },
paused: togglePaused,
remove: removeAnnotation, remove: removeAnnotation,
resize: resizeAnnotations, resize: resizeAnnotations,
resizeend: resizeendAnnotations, resizeend: resizeendAnnotations,
@ -648,6 +647,30 @@ Ox.VideoEditor = function(options, self) {
togglemap: function(data) { togglemap: function(data) {
self.options.showAnnotationsMap = !data.collapsed; self.options.showAnnotationsMap = !data.collapsed;
that.triggerEvent('togglemap', data); that.triggerEvent('togglemap', data);
},
key_b: function() {
that.triggerEvent('key_b');
},
key_equal: function() {
that.triggerEvent('key_equal');
},
key_f: function() {
that.triggerEvent('key_f');
},
key_g: function() {
that.triggerEvent('key_g');
},
key_minus: function() {
that.triggerEvent('key_minus');
},
key_n: function() {
that.triggerEvent('key_n');
},
key_shift_g: function() {
that.triggerEvent('key_shift_g');
},
key_space: function() {
that.triggerEvent('key_space');
} }
}); });