diff --git a/source/Ox.UI/js/Menu/Menu.js b/source/Ox.UI/js/Menu/Menu.js index e9b766ae..a21dfe50 100644 --- a/source/Ox.UI/js/Menu/Menu.js +++ b/source/Ox.UI/js/Menu/Menu.js @@ -375,7 +375,7 @@ Ox.Menu = function(options, self) { speed = direction == 'up' ? -1 : 1; return $('
', { 'class': 'OxScrollbar Ox' + Ox.toTitleCase(direction), - html: Ox.UI.symbols['triangle_' + direction], + html: Ox.SYMBOLS['triangle_' + direction], click: function() { // fixme: do we need to listen to click event? return false; }, diff --git a/source/Ox.UI/js/Menu/MenuItem.js b/source/Ox.UI/js/Menu/MenuItem.js index f9ab9d1c..43db8d45 100644 --- a/source/Ox.UI/js/Menu/MenuItem.js +++ b/source/Ox.UI/js/Menu/MenuItem.js @@ -45,7 +45,7 @@ Ox.MenuItem = function(options, self) { })) .update({ checked: function() { - that.$status.html(self.options.checked ? Ox.UI.symbols.check : '') + that.$status.html(self.options.checked ? Ox.SYMBOLS.check : '') }, disabled: function() { that[ @@ -80,7 +80,7 @@ Ox.MenuItem = function(options, self) { that.append( that.$status = Ox.$('') .addClass('OxCell OxStatus') - .html(self.options.checked ? Ox.UI.symbols.check : '') + .html(self.options.checked ? Ox.SYMBOLS.check : '') ) .append( that.$icon = $('') @@ -132,19 +132,19 @@ Ox.MenuItem = function(options, self) { ) .html( self.options.items.length - ? Ox.UI.symbols.triangle_right + ? Ox.SYMBOLS.triangle_right : formatKey() ) ); function formatKey() { - return Ox.UI.symbols[self.options.keyboard.key] + return Ox.SYMBOLS[self.options.keyboard.key] || self.options.keyboard.key.toUpperCase(); } function formatModifiers() { return self.options.keyboard.modifiers.map(function(modifier) { - return Ox.UI.symbols[modifier]; + return Ox.SYMBOLS[modifier]; }).join(''); } diff --git a/source/Ox.UI/js/Video/VideoAnnotationPanel.js b/source/Ox.UI/js/Video/VideoAnnotationPanel.js index a2ace59a..e3276760 100644 --- a/source/Ox.UI/js/Video/VideoAnnotationPanel.js +++ b/source/Ox.UI/js/Video/VideoAnnotationPanel.js @@ -538,26 +538,26 @@ Ox.VideoAnnotationPanel = function(options, self) { self.$keyboardShortcuts = $('
').css({margin: '16px'}); [ - {key: Ox.UI.symbols.space, action: Ox._('Play/Pause')}, + {key: Ox.SYMBOLS.space, action: Ox._('Play/Pause')}, {key: 'P', action: Ox._('Play In to Out')}, {key: 'L', action: Ox._('Loop')}, {key: '0', action: Ox._('Mute/Unmute')}, {key: '-', action: Ox._('Turn Volume Down')}, {key: '+', action: Ox._('Turn Volume Up')}, - {key: Ox.UI.symbols.shift + '-', action: Ox._('Small Player')}, - {key: Ox.UI.symbols.shift + '+', action: Ox._('Large Player')}, - {key: Ox.UI.symbols.arrow_left, action: Ox._('Go One Frame Back')}, - {key: Ox.UI.symbols.arrow_right, action: Ox._('Go One Frame Forward')}, - {key: Ox.UI.symbols.shift + Ox.UI.symbols.arrow_left, action: Ox._('Go One Second Back')}, - {key: Ox.UI.symbols.shift + Ox.UI.symbols.arrow_right, action: Ox._('Go One Second Forward')}, - {key: Ox.UI.symbols.arrow_up, action: Ox._('Go One Line Up')}, - {key: Ox.UI.symbols.arrow_down, action: Ox._('Go One Line Down')}, - {key: Ox.UI.symbols.shift + Ox.UI.symbols.arrow_up, action: Ox._('Go to First Frame')}, - {key: Ox.UI.symbols.shift + Ox.UI.symbols.arrow_down, action: Ox._('Go to Last Frame')}, + {key: Ox.SYMBOLS.shift + '-', action: Ox._('Small Player')}, + {key: Ox.SYMBOLS.shift + '+', action: Ox._('Large Player')}, + {key: Ox.SYMBOLS.arrow_left, action: Ox._('Go One Frame Back')}, + {key: Ox.SYMBOLS.arrow_right, action: Ox._('Go One Frame Forward')}, + {key: Ox.SYMBOLS.shift + Ox.SYMBOLS.arrow_left, action: Ox._('Go One Second Back')}, + {key: Ox.SYMBOLS.shift + Ox.SYMBOLS.arrow_right, action: Ox._('Go One Second Forward')}, + {key: Ox.SYMBOLS.arrow_up, action: Ox._('Go One Line Up')}, + {key: Ox.SYMBOLS.arrow_down, action: Ox._('Go One Line Down')}, + {key: Ox.SYMBOLS.shift + Ox.SYMBOLS.arrow_up, action: Ox._('Go to First Frame')}, + {key: Ox.SYMBOLS.shift + Ox.SYMBOLS.arrow_down, action: Ox._('Go to Last Frame')}, {key: 'I', action: Ox._('Set In Point')}, {key: 'O', action: Ox._('Set Out Point')}, - {key: Ox.UI.symbols.shift + 'I', action: Ox._('Go to In Point')}, - {key: Ox.UI.symbols.shift + 'O', action: Ox._('Go to Out Point')}, + {key: Ox.SYMBOLS.shift + 'I', action: Ox._('Go to In Point')}, + {key: Ox.SYMBOLS.shift + 'O', action: Ox._('Go to Out Point')}, {key: '[', action: Ox._('Go to Previous Annotation')}, {key: ']', action: Ox._('Go to Next Annotation')}, {key: '\\', action: Ox._('Select Current Annotation')}, @@ -567,10 +567,10 @@ Ox.VideoAnnotationPanel = function(options, self) { {key: '>', action: Ox._('Go to Next Cut')}, {key: '/', action: Ox._('Select Current Cut')}, {key: 'F', action: Ox._('Find')}, - {key: Ox.UI.symbols.shift + 'G', action: Ox._('Go to Previous Result')}, + {key: Ox.SYMBOLS.shift + 'G', action: Ox._('Go to Previous Result')}, {key: 'G', action: Ox._('Go to Next Result')}, - {key: Ox.UI.symbols['return'], action: Ox._('Edit/Submit')}, - {key: Ox.UI.symbols.escape, action: Ox._('Cancel/Deselect')} + {key: Ox.SYMBOLS['return'], action: Ox._('Edit/Submit')}, + {key: Ox.SYMBOLS.escape, action: Ox._('Cancel/Deselect')} ].concat( Ox.filter(self.options.layers.map(function(layer, i) { return layer.editable