diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index 5a9aabec..4f421894 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -117,7 +117,6 @@ Ox.VideoEditor = function(options, self) { key_g: function() { self.results.length && selectAnnotation(getNextAnnotation('result', 1)); }, - key_h: showKeyboardShortcuts, key_i: function() { setPoint('in', self.options.position); }, @@ -398,8 +397,10 @@ Ox.VideoEditor = function(options, self) { {key: 'G', action: 'Go to Next Result'}, {key: Ox.UI.symbols['return'], action: 'Edit/Submit'}, {key: Ox.UI.symbols.escape, action: 'Cancel/Deselect'} - ], self.options.layers.map(function(layer, i) { - return {key: i + 1, action: 'Add ' + layer.item}; + ], Ox.map(self.options.layers, function(layer, i) { + return layer.editable + ? {key: i + 1, action: 'Add ' + layer.item} + : null; })).forEach(function(shortcut) { self.$keyboardShortcuts.append( $('
').css({display: 'table-row'}) @@ -452,7 +453,17 @@ Ox.VideoEditor = function(options, self) { click: function(data) { var id = data.id; if (id == 'keyboard') { - showKeyboardShortcuts(); + var dialog = Ox.Dialog({ + buttons: [ + Ox.Button({id: 'close', title: 'Close'}) + .bindEvent({click: function() { dialog.close(); }}) + ], + content: self.$keyboardShortcuts, + height: 384, + keys: {enter: 'close', escape: 'close'}, + title: 'Keyboard Shortcuts', + width: 256 + }).open(); } else if (id == 'downloadVideo') { that.triggerEvent('downloadvideo'); } else if (id == 'downloadSelection') { @@ -1092,20 +1103,6 @@ Ox.VideoEditor = function(options, self) { }); } - function showKeyboardShortcuts() { - var dialog = Ox.Dialog({ - buttons: [ - Ox.Button({id: 'close', title: 'Close'}) - .bindEvent({click: function() { dialog.close(); }}) - ], - content: self.$keyboardShortcuts, - height: 384, - keys: {enter: 'close', escape: 'close'}, - title: 'Keyboard Shortcuts', - width: 256 - }).open(); - } - function setTimelineState() { self.$timeline[1].options({ state: self.editing ? 'editing'