beginning to fix #318
This commit is contained in:
parent
e46b568322
commit
c040e48601
3 changed files with 71 additions and 6 deletions
|
@ -261,8 +261,29 @@ Ox.AnnotationFolder = function(options, self) {
|
|||
that.triggerEvent('selectnone');
|
||||
},
|
||||
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() {
|
||||
that.triggerEvent('paused');
|
||||
that.triggerEvent('key_space');
|
||||
}
|
||||
})
|
||||
.appendTo(
|
||||
|
|
|
@ -190,9 +190,6 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
info: function(data) {
|
||||
that.triggerEvent('info', {layer: layer.id});
|
||||
},
|
||||
paused: function() {
|
||||
that.triggerEvent('paused')
|
||||
},
|
||||
remove: function(data) {
|
||||
that.triggerEvent('remove', Ox.extend({layer: layer.id}, data));
|
||||
},
|
||||
|
@ -221,6 +218,30 @@ Ox.AnnotationPanel = function(options, self) {
|
|||
that.triggerEvent('toggle' + (
|
||||
layer.type == 'event' ? 'calendar' : 'map'
|
||||
), 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);
|
||||
|
|
|
@ -128,7 +128,7 @@ Ox.VideoEditor = function(options, self) {
|
|||
self.options.videoSize == 'large' && toggleSize();
|
||||
},
|
||||
key_n: function() {
|
||||
self.annotations.length && selectAnnotation(getNextAnnotation('annotation', 1), true);
|
||||
self.annotations.length && selectAnnotation(getNextAnnotation('annotation', 1));
|
||||
},
|
||||
key_o: function() {
|
||||
setPoint('out', self.options.position);
|
||||
|
@ -620,7 +620,6 @@ Ox.VideoEditor = function(options, self) {
|
|||
info: function(data) {
|
||||
that.triggerEvent('info', data);
|
||||
},
|
||||
paused: togglePaused,
|
||||
remove: removeAnnotation,
|
||||
resize: resizeAnnotations,
|
||||
resizeend: resizeendAnnotations,
|
||||
|
@ -648,6 +647,30 @@ Ox.VideoEditor = function(options, self) {
|
|||
togglemap: function(data) {
|
||||
self.options.showAnnotationsMap = !data.collapsed;
|
||||
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');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
Loading…
Reference in a new issue