From dc8bde4f731d32b8a984b2f60790754403121666 Mon Sep 17 00:00:00 2001 From: rolux Date: Thu, 31 Jan 2013 17:28:35 +0530 Subject: [PATCH] fix video buttons --- source/Ox.UI/css/theme.css | 3 ++- source/Ox.UI/js/Form/Button.js | 7 +++--- source/Ox.UI/js/Video/VideoPlayer.js | 36 ++++++++++++++-------------- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/source/Ox.UI/css/theme.css b/source/Ox.UI/css/theme.css index 12709858..e2696dac 100644 --- a/source/Ox.UI/css/theme.css +++ b/source/Ox.UI/css/theme.css @@ -325,7 +325,8 @@ Forms background-image: -webkit-linear-gradient(top, $buttonDisabledGradient); color: $buttonDisabledColor; } -.$themeClass .OxButton.OxSymbol.OxDisabled { +.$themeClass .OxButton.OxSymbol.OxDisabled, +.$themeClass .OxButton.OxVideo.OxDisabled { background-color: transparent; background-image: none; } diff --git a/source/Ox.UI/js/Form/Button.js b/source/Ox.UI/js/Form/Button.js index 2bb3ce10..b6c1e6d2 100644 --- a/source/Ox.UI/js/Form/Button.js +++ b/source/Ox.UI/js/Form/Button.js @@ -10,7 +10,7 @@ Ox.Button Button Object id Element id overlap 'none', 'left' or 'right' selectable If true, button is selectable - style 'default', 'checkbox', 'symbol' or 'tab' + style 'default', 'checkbox', 'symbol', 'tab' or 'video' title Button title tooltip Tooltip type 'text' or 'image' @@ -69,7 +69,7 @@ Ox.Button = function(options, self) { .addClass( 'OxButton Ox' + Ox.toTitleCase(self.options.size) + (self.options.disabled ? ' OxDisabled': '') - + (self.options.selectable && self.options.value ? ' OxSelected': '') + + (self.options.selectable && self.options.value ? ' OxSelected' : '') + (self.options.style != 'default' ? ' Ox' + Ox.toTitleCase(self.options.style) : '') + (self.options.overlap != 'none' ? ' OxOverlap' + Ox.toTitleCase(self.options.overlap) : '') ) @@ -145,7 +145,8 @@ Ox.Button = function(options, self) { src: Ox.UI.getImageURL( 'symbol' + self.options.title[0].toUpperCase() + self.options.title.slice(1), - self.options.disabled ? 'disabled' + self.options.style == 'video' ? 'video' + : self.options.disabled ? 'disabled' : self.options.selectable && self.options.value ? 'selected' : '' ) diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js index 3f4a6757..f28fed3e 100644 --- a/source/Ox.UI/js/Video/VideoPlayer.js +++ b/source/Ox.UI/js/Video/VideoPlayer.js @@ -601,7 +601,7 @@ Ox.VideoPlayer = function(options, self) { if (control == 'close') { self.$closeButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'close', tooltip: 'Close', type: 'image' @@ -616,7 +616,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'find') { self.$findButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'find', tooltip: 'Find', type: 'image' @@ -629,7 +629,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'fullscreen') { self.$fullscreenButton = Ox.Button({ - style: 'symbol', + style: 'video', tooltip: ['Enter Fullscreen', 'Exit Fullscreen'], type: 'image', value: self.options.fullscreen ? 'shrink' : 'grow', @@ -645,7 +645,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'goto') { self.$setButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'goTo' + Ox.toTitleCase(self.options.type), tooltip: 'Go to ' + Ox.toTitleCase(self.options.type) + ' Point', type: 'image' @@ -658,7 +658,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'mute') { self.$muteButton = Ox.Button({ - style: 'symbol', + style: 'video', tooltip: ['Mute', 'Unmute'], type: 'image', value: self.options.muted ? 'unmute' : 'mute', @@ -674,7 +674,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'next') { self.$nextClipButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'arrowRight', tooltip: 'Next', type: 'image' @@ -689,7 +689,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'open') { self.$openButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'arrowRight', tooltip: self.options.controlsTooltips.open || '', type: 'image' @@ -704,7 +704,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'play') { self.$playButton = Ox.Button({ - style: 'symbol', + style: 'video', // FIXME: this is retarded, fix Ox.Button tooltip: ['Play', 'Pause'], type: 'image', @@ -721,7 +721,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'playInToOut') { self.$playInToOutButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'playInToOut', tooltip: 'Play In to Out', type: 'image' @@ -799,7 +799,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'previous') { self.$previousClipButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'arrowLeft', tooltip: 'Previous', type: 'image' @@ -814,7 +814,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'scale') { self.$scaleButton = Ox.Button({ - style: 'symbol', + style: 'video', tooltip: ['Scale to Fill', 'Scale to Fit'], type: 'image', value: self.options.scaleToFill ? 'fit' : 'fill', @@ -828,7 +828,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'set') { self.$setButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'set' + Ox.toTitleCase(self.options.type), tooltip: 'Set ' + Ox.toTitleCase(self.options.type) + ' Point', type: 'image' @@ -841,7 +841,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'settings') { self.$settingsButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'set', tooltip: 'Settings', type: 'image' @@ -858,7 +858,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'size') { self.$sizeButton = Ox.Button({ - style: 'symbol', + style: 'video', tooltip: ['Larger', 'Smaller'], type: 'image', value: self.options.sizeIsLarge ? 'shrink' : 'grow', @@ -907,7 +907,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'volume') { self.$volumeButton = Ox.Button({ - style: 'symbol', + style: 'video', title: getVolumeImage(), tooltip: 'Volume', type: 'image' @@ -920,7 +920,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'zapHome') { self.$zapHomeButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'up', tooltip: 'Home Channel', type: 'image' @@ -935,7 +935,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'zapNext') { self.$zapNextButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'right', tooltip: 'Next Channel', type: 'image' @@ -950,7 +950,7 @@ Ox.VideoPlayer = function(options, self) { } else if (control == 'zapPrevious') { self.$zapPreviousButton = Ox.Button({ - style: 'symbol', + style: 'video', title: 'left', tooltip: 'Previous Channel', type: 'image'