diff --git a/source/Ox.UI/js/Bar/Ox.Progressbar.js b/source/Ox.UI/js/Bar/Ox.Progressbar.js index 59b77545..8be09755 100644 --- a/source/Ox.UI/js/Bar/Ox.Progressbar.js +++ b/source/Ox.UI/js/Bar/Ox.Progressbar.js @@ -51,12 +51,10 @@ Ox.Progressbar = function(options, self) { if (self.options.showPauseButton) { self.$pauseButton = Ox.Button({ style: 'symbol', - title: [ - {id: 'pause', title: 'pause', selected: !self.options.paused}, - {id: 'resume', title: 'redo', selected: self.options.paused} - ], tooltip: ['Pause', 'Resume'], - type: 'image' + type: 'image', + value: !self.options.paused ? 'pause' : 'resume', + values: ['pause', 'resume'] }) .bindEvent({ click: togglePaused diff --git a/source/Ox.UI/js/Core/Ox.Element.js b/source/Ox.UI/js/Core/Ox.Element.js index 9bc97dce..d6d84780 100644 --- a/source/Ox.UI/js/Core/Ox.Element.js +++ b/source/Ox.UI/js/Core/Ox.Element.js @@ -248,7 +248,7 @@ Ox.Element = function(options, self) { if (self.options.tooltip) { if (Ox.isString(self.options.tooltip)) { that.$tooltip = Ox.Tooltip({ - title: self.options.tooltip, + title: self.options.tooltip }); that.bind({ mouseenter: mouseenter diff --git a/source/Ox.UI/js/List/Ox.ItemInput.js b/source/Ox.UI/js/List/Ox.ItemInput.js index a7aacbe4..44c74b68 100644 --- a/source/Ox.UI/js/List/Ox.ItemInput.js +++ b/source/Ox.UI/js/List/Ox.ItemInput.js @@ -8,7 +8,7 @@ Ox.ItemInput ItemInput Object (options) -> ItemInput Object (options, self) -> ItemInput Object options Options object - type can be textare + type can be textarea value default value height height width width diff --git a/source/Ox.UI/js/Map/Ox.Map.js b/source/Ox.UI/js/Map/Ox.Map.js index 9309a7fa..bfadb5ba 100644 --- a/source/Ox.UI/js/Map/Ox.Map.js +++ b/source/Ox.UI/js/Map/Ox.Map.js @@ -564,8 +564,6 @@ Ox.Map = function(options, self) { addPlaceToMap(); } else if (title == 'Add Place') { addPlaceToPlaces(); - } else if (title == 'Remove Place') { - } } diff --git a/source/Ox.UI/js/Panel/Ox.TabPanel.js b/source/Ox.UI/js/Panel/Ox.TabPanel.js index 685515b2..9694867b 100644 --- a/source/Ox.UI/js/Panel/Ox.TabPanel.js +++ b/source/Ox.UI/js/Panel/Ox.TabPanel.js @@ -17,7 +17,7 @@ Ox.TabPanel = function(options, self) { self.$tabs = Ox.ButtonGroup({ buttons: self.options.tabs, id: 'tabs', - selectable: true, + selectable: true }) .bindEvent({ change: function(data) { diff --git a/source/Ox.UI/js/Video/Ox.VideoEditor.js b/source/Ox.UI/js/Video/Ox.VideoEditor.js index 6e6132cf..04fb84e3 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditor.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditor.js @@ -493,9 +493,9 @@ Ox.VideoEditor = function(options, self) { .css({float: 'left'}) .bindEvent({ click: function() { - self.$goToPosterButton.toggleDisabled(); - self.$setPosterButton.toggleDisabled(); - self.$unlockPosterButton.toggleTitle(); + self.$goToPosterButton.toggleOption('disabled'); + self.$setPosterButton.toggleOption('disabled'); + self.$unlockPosterButton.toggle(); } }) .appendTo(self.$videobar); @@ -512,7 +512,7 @@ Ox.VideoEditor = function(options, self) { .css({float: 'left'}) .bindEvent({ click: function() { - self.$setPosterButton.toggleDisabled(); + self.$setPosterButton.toggleOption('disabled'); } }) .appendTo(self.$videobar); @@ -632,9 +632,6 @@ Ox.VideoEditor = function(options, self) { }) .css({float: 'left'}) .appendTo(self.$annotationsbar); - self.$annotationsMenuButton.find('input').attr({ - src: Ox.UI.getImageURL('symbolSet') - }); that.$element = Ox.SplitPanel({ elements: [ diff --git a/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js b/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js index f633d4fb..e6062f54 100644 --- a/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoEditorPlayer.js @@ -126,12 +126,9 @@ Ox.VideoEditorPlayer = function(options, self) { // fixme: $buttonPlay etc. ? self.$playButton = Ox.Button({ id: self.options.id + 'Play', - title: [ - {id: 'play', title: 'play'}, - {id: 'pause', title: 'pause'} - ], tooltip: ['Play', 'Pause'], - type: 'image' + type: 'image', + values: ['play', 'pause'] }) .bindEvent('click', togglePlay) .appendTo(self.$controls); @@ -147,26 +144,21 @@ Ox.VideoEditorPlayer = function(options, self) { .appendTo(self.$controls); self.$muteButton = Ox.Button({ id: self.options.id + 'Mute', - title: [ - {id: 'mute', title: 'mute'}, - {id: 'unmute', title: 'unmute'} - ], tooltip: ['Mute', 'Unmute'], - type: 'image' + type: 'image', + values: ['mute', 'unmute'] }) .bindEvent('click', toggleMute) .appendTo(self.$controls); self.$sizeButton = Ox.Button({ id: self.options.id + 'Size', - title: self.options.size == 'small' ? [ - {id: 'large', title: 'grow'}, - {id: 'small', title: 'shrink'} - ] : [ - {id: 'small', title: 'shrink'}, - {id: 'large', title: 'grow'} - ], tooltip: ['Larger', 'Smaller'], - type: 'image' + type: 'image', + value: self.options.size, + values: [ + {id: 'small', title: 'grow'}, + {id: 'large', title: 'shrink'} + ] }) .bindEvent('click', toggleSize) .appendTo(self.$controls); @@ -254,7 +246,7 @@ Ox.VideoEditorPlayer = function(options, self) { } function paused() { - self.$playButton.toggleTitle(); + self.$playButton.toggle(); } function playing(data) { @@ -412,7 +404,7 @@ Ox.VideoEditorPlayer = function(options, self) { playInToOut playInToOut @*/ that.playInToOut = function() { - self.$video.paused() && self.$playButton.toggleTitle(); + self.$video.paused() && self.$playButton.toggle(); self.$video.playInToOut(); return that; }; diff --git a/source/Ox.UI/js/Video/Ox.VideoPlayer.js b/source/Ox.UI/js/Video/Ox.VideoPlayer.js index 96a407eb..4e08efd4 100644 --- a/source/Ox.UI/js/Video/Ox.VideoPlayer.js +++ b/source/Ox.UI/js/Video/Ox.VideoPlayer.js @@ -536,12 +536,10 @@ Ox.VideoPlayer = function(options, self) { self.$fullscreenButton = Ox.Button({ style: 'symbol', - title: [ - {id: 'grow', title: 'grow', selected: !self.options.fullscreen}, - {id: 'shrink', title: 'shrink', selected: self.options.fullscreen} - ], tooltip: ['Enter Fullscreen', 'Exit Fullscreen'], - type: 'image' + type: 'image', + value: self.options.fullscreen ? 'shrink' : 'grow' + values: ['grow', 'shrink'] }) .bindEvent({ click: function() { @@ -567,12 +565,10 @@ Ox.VideoPlayer = function(options, self) { self.$muteButton = Ox.Button({ style: 'symbol', - title: [ - {id: 'mute', title: 'mute', selected: !self.options.muted}, - {id: 'unmute', title: 'unmute', selected: self.options.muted} - ], tooltip: ['Mute', 'Unmute'], - type: 'image' + type: 'image', + value: self.options.muted ? 'unmute' : 'mute', + values: ['mute', 'unmute'] }) .bindEvent({ click: function() { @@ -601,12 +597,10 @@ Ox.VideoPlayer = function(options, self) { self.$playButton = Ox.Button({ style: 'symbol', // FIXME: this is retarded, fix Ox.Button - title: [ - {id: 'play', title: 'play', selected: self.options.paused}, - {id: 'pause', title: 'pause', selected: !self.options.paused} - ], tooltip: ['Play', 'Pause'], - type: 'image' + type: 'image', + value: self.options.paused ? 'play' : 'pause', + values: ['play', 'pause'] }) .bindEvent({ click: function() { @@ -729,9 +723,9 @@ Ox.VideoPlayer = function(options, self) { self.$resolution.children().each(function() { var $this = $(this); $this.children()[1].src = - $this.data('resolution') == resolution ? - Ox.UI.getImageURL('symbolCheck') : - Ox.UI.PATH + 'png/transparent.png' + $this.data('resolution') == resolution + ? Ox.UI.getImageURL('symbolCheck') + : Ox.UI.PATH + 'png/transparent.png' }); self.$resolutionButton.html(resolution + 'p'); self.options.resolution = resolution @@ -770,12 +764,10 @@ Ox.VideoPlayer = function(options, self) { self.$scaleButton = Ox.Button({ style: 'symbol', - title: [ - {id: 'fill', title: 'fill', selected: !self.options.scaleToFill}, - {id: 'fit', title: 'fit', selected: self.options.scaleToFill} - ], tooltip: ['Scale to Fill', 'Scale to Fit'], - type: 'image' + type: 'image', + value: self.options.scaleToFill ? 'fit' : 'fill', + values: ['fill', 'fit'] }) .bindEvent('click', function() { toggleScale('button'); @@ -799,12 +791,10 @@ Ox.VideoPlayer = function(options, self) { self.$sizeButton = Ox.Button({ style: 'symbol', - title: [ - {id: 'grow', title: 'grow', selected: !self.options.sizeIsLarge}, - {id: 'shrink', title: 'shrink', selected: self.options.sizeIsLarge} - ], tooltip: ['Larger', 'Smaller'], - type: 'image' + type: 'image', + value: self.options.sizeIsLarge ? 'shrink' : 'grow', + values: ['grow', 'shrink'] }) .bindEvent('click', toggleSize) .appendTo(self['$controls' + titleCase]); @@ -1002,12 +992,10 @@ Ox.VideoPlayer = function(options, self) { self.$muteButton = Ox.Button({ style: 'symbol', - title: [ - {id: 'mute', title: 'mute', selected: !self.options.muted}, - {id: 'unmute', title: 'unmute', selected: self.options.muted} - ], tooltip: ['Mute', 'Unmute'], type: 'image' + value: self.options.muted ? 'unmute' : 'mute', + values: ['mute', 'unmute'] }) .bindEvent({ click: function() { @@ -1601,9 +1589,7 @@ Ox.VideoPlayer = function(options, self) { } else if (self.options.paused && self.playOnLoad) { togglePaused('button'); } - self.$playButton && self.$playButton.options({ - disabled: false - }); + self.$playButton && self.$playButton.options({disabled: false}); hideLoadingIcon(); if (self.options.showIcon || self.options.showIconOnLoad) { @@ -1803,9 +1789,7 @@ Ox.VideoPlayer = function(options, self) { self.loadedMetadata = false; showLoadingIcon(); self.$video.src(self.options.video[self.options.resolution]); - self.$playButton && self.$playButton.options({ - disabled: true - }); + self.$playButton && self.$playButton.options({disabled: true}); that.triggerEvent('resolution', { resolution: self.options.resolution }); @@ -2119,7 +2103,7 @@ Ox.VideoPlayer = function(options, self) { }); } if (self.$fullscreenButton && from != 'button') { - self.$fullscreenButton.toggleTitle(); + self.$fullscreenButton.toggle(); } that.triggerEvent('fullscreen', { fullscreen: self.options.fullscreen @@ -2135,7 +2119,7 @@ Ox.VideoPlayer = function(options, self) { self.$video.volume(1); } if (self.$muteButton && from != 'button') { - self.$muteButton.toggleTitle(); + self.$muteButton.toggle(); } self.$volumeButton && self.$volumeButton.attr({ src: getVolumeImageURL() @@ -2182,7 +2166,7 @@ Ox.VideoPlayer = function(options, self) { self.options.showMarkers && hideMarkers(); } if (self.$playButton && from != 'button') { - self.$playButton.toggleTitle(); + self.$playButton.toggle(); } that.triggerEvent('paused', { paused: self.options.paused @@ -2206,7 +2190,7 @@ Ox.VideoPlayer = function(options, self) { self.$video.animate(self.videoCSS, 250); self.$poster && self.$poster.animate(self.videoCSS, 250); if (self.$scaleButton && from != 'button') { - self.$scaleButton.toggleTitle(); + self.$scaleButton.toggle(); } if (self.$posterMarker) { self.posterMarkerCSS = getPosterMarkerCSS(); diff --git a/source/Ox.UI/js/Window/Ox.Dialog.js b/source/Ox.UI/js/Window/Ox.Dialog.js index 13208566..add4277b 100644 --- a/source/Ox.UI/js/Window/Ox.Dialog.js +++ b/source/Ox.UI/js/Window/Ox.Dialog.js @@ -95,11 +95,8 @@ Ox.Dialog = function(options, self) { if (self.options.maximizeButton) { self.$maximizeButton = Ox.Button({ - title: [ - {id: 'add', title: 'add'}, - {id: 'remove', title: 'remove'} - ], - type: 'image' + type: 'image', + values: ['add', 'remove'] }) .css({ top: '4px', @@ -344,7 +341,7 @@ Ox.Dialog = function(options, self) { }; decenter(); if (self.maximized) { - self.$maximizeButton.toggleTitle(); + self.$maximizeButton.toggle(); self.maximized = false; } that.wrap(self.$box); @@ -658,7 +655,7 @@ Ox.Dialog = function(options, self) { callback && callback(); }); if (self.maximized) { - self.$maximizeButton.toggleTitle(); + self.$maximizeButton.toggle(); self.maximized = false; } if (self.options.focus) { diff --git a/source/Ox.UI/themes/classic/css/classic.css b/source/Ox.UI/themes/classic/css/classic.css index 3cd8c296..63668927 100644 --- a/source/Ox.UI/themes/classic/css/classic.css +++ b/source/Ox.UI/themes/classic/css/classic.css @@ -716,10 +716,10 @@ Miscellaneous ================================================================================ */ -.OxThemeClassic .OxSelectable.OxSelected { +.OxThemeClassic .OxSelectableElement.OxSelected { background: rgb(224, 224, 224); } -.OxThemeClassic .OxSelectable.OxSelected.OxFocus { +.OxThemeClassic .OxSelectableElement.OxSelected.OxFocus { background: rgb(208, 208, 208); } diff --git a/source/Ox.UI/themes/modern/css/modern.css b/source/Ox.UI/themes/modern/css/modern.css index 39590013..959e6c83 100644 --- a/source/Ox.UI/themes/modern/css/modern.css +++ b/source/Ox.UI/themes/modern/css/modern.css @@ -741,10 +741,10 @@ Miscellaneous ================================================================================ */ -.OxThemeModern .OxSelectable.OxSelected { +.OxThemeModern .OxSelectableElement.OxSelected { background: rgb(48, 48, 48); } -.OxThemeModern .OxSelectable.OxSelected.OxFocus { +.OxThemeModern .OxSelectableElement.OxSelected.OxFocus { background: rgb(64, 64, 64); }