From 4ea696b451ec814ff6736665325927027ccfd11e Mon Sep 17 00:00:00 2001 From: rlx <0x0073@0x2620.org> Date: Thu, 25 Sep 2014 12:28:47 +0200 Subject: [PATCH] Ox.UI.getImageURL -> Ox.getImageURL --- source/Ox.UI/js/Code/DocPage.js | 10 +++++----- source/Ox.UI/js/Code/DocPanel.js | 4 ++-- source/Ox.UI/js/Code/ExamplePanel.js | 2 +- source/Ox.UI/js/Core/LoadingIcon.js | 2 +- source/Ox.UI/js/Core/Theme.js | 6 +++--- source/Ox.UI/js/Form/Button.js | 2 +- source/Ox.UI/js/Form/FormPanel.js | 2 +- source/Ox.UI/js/List/TableList.js | 14 +++++++------- source/Ox.UI/js/List/TreeList.js | 2 +- source/Ox.UI/js/Video/BlockVideoTimeline.js | 4 ++-- source/Ox.UI/js/Video/LargeVideoTimeline.js | 8 ++++---- source/Ox.UI/js/Video/SmallVideoTimeline.js | 4 ++-- source/Ox.UI/js/Video/VideoPlayer.js | 8 ++++---- source/Ox.UI/js/Video/VideoPlayerMenu.js | 4 ++-- 14 files changed, 36 insertions(+), 36 deletions(-) diff --git a/source/Ox.UI/js/Code/DocPage.js b/source/Ox.UI/js/Code/DocPage.js index 43714825..3df82314 100644 --- a/source/Ox.UI/js/Code/DocPage.js +++ b/source/Ox.UI/js/Code/DocPage.js @@ -145,8 +145,8 @@ Ox.DocPage = function(options, self) { Ox.$('') .attr({ src: isExpanded - ? Ox.UI.getImageURL('symbolDown') - : Ox.UI.getImageURL('symbolRight') + ? Ox.getImageURL('symbolDown') + : Ox.getImageURL('symbolRight') }) .css({ width: '12px', @@ -156,11 +156,11 @@ Ox.DocPage = function(options, self) { .on({ click: function() { var $this = $(this), - isExpanded = $this.attr('src') == Ox.UI.getImageURL('symbolRight'); + isExpanded = $this.attr('src') == Ox.getImageURL('symbolRight'); $this.attr({ src: isExpanded - ? Ox.UI.getImageURL('symbolDown') - : Ox.UI.getImageURL('symbolRight') + ? Ox.getImageURL('symbolDown') + : Ox.getImageURL('symbolRight') }); $('.' + className).each(function() { var $this = $(this), isHidden = false; diff --git a/source/Ox.UI/js/Code/DocPanel.js b/source/Ox.UI/js/Code/DocPanel.js index adab5131..cc9542f4 100644 --- a/source/Ox.UI/js/Code/DocPanel.js +++ b/source/Ox.UI/js/Code/DocPanel.js @@ -197,7 +197,7 @@ Ox.DocPanel = function(options, self) { self.options.showTooltips ? getTooltip(results) : null ); } else if (!Ox.endsWith(id, '/')) { - $icon = $('').attr({src: Ox.UI.getImageURL('symbolCenter')}); + $icon = $('').attr({src: Ox.getImageURL('symbolCenter')}); } return $icon; } @@ -293,7 +293,7 @@ Ox.DocPanel = function(options, self) { expanded: self.options.expanded, icon: self.options.showTests ? getIcon - : Ox.UI.getImageURL('symbolCenter'), + : Ox.getImageURL('symbolCenter'), items: treeItems, selected: self.options.selected ? [self.options.selected] : '', width: self.options.size diff --git a/source/Ox.UI/js/Code/ExamplePanel.js b/source/Ox.UI/js/Code/ExamplePanel.js index 1b8bd859..4619ce66 100644 --- a/source/Ox.UI/js/Code/ExamplePanel.js +++ b/source/Ox.UI/js/Code/ExamplePanel.js @@ -75,7 +75,7 @@ Ox.ExamplePanel = function(options, self) { }); self.$list = Ox.TreeList({ expanded: true, - icon: Ox.UI.getImageURL('symbolCenter'), + icon: Ox.getImageURL('symbolCenter'), items: treeItems, selected: self.options.selected ? [self.options.selected] : [], width: self.options.size diff --git a/source/Ox.UI/js/Core/LoadingIcon.js b/source/Ox.UI/js/Core/LoadingIcon.js index 0ab96f79..74d40547 100644 --- a/source/Ox.UI/js/Core/LoadingIcon.js +++ b/source/Ox.UI/js/Core/LoadingIcon.js @@ -19,7 +19,7 @@ Ox.LoadingIcon = function(options, self) { .options(options || {}) .addClass('OxLoadingIcon') .attr({ - src: Ox.UI.getImageURL( + src: Ox.getImageURL( 'symbolLoading', self.options.video ? 'videoIcon' : null ) diff --git a/source/Ox.UI/js/Core/Theme.js b/source/Ox.UI/js/Core/Theme.js index 3a6ce785..87824aa8 100644 --- a/source/Ox.UI/js/Core/Theme.js +++ b/source/Ox.UI/js/Core/Theme.js @@ -99,7 +99,7 @@ Ox.Theme = (function() { $('.OxColor').each(function() { var $element = $(this); if ($element.hasClass('OxColorName')) { - $element.attr({src: Ox.UI.getImageURL( + $element.attr({src: Ox.getImageURL( $element.data('OxImage'), $element.data('OxColor'), theme )}); } else { @@ -121,7 +121,7 @@ Ox.Theme = (function() { var $element = $(this), data = Ox.UI.getImageData($element.attr('src')); data && $element.attr({ - src: Ox.UI.getImageURL(data.name, data.color, theme) + src: Ox.getImageURL(data.name, data.color, theme) }); }); } @@ -166,7 +166,7 @@ Ox.Theme = (function() { that.getColorImage = function(name, value, tooltip) { return (tooltip ? Ox.Element({element: '', tooltip: tooltip}) : $('')) .addClass('OxColor OxColorName') - .attr({src: Ox.UI.getImageURL(name, value)}) + .attr({src: Ox.getImageURL(name, value)}) .data({OxColor: value, OxImage: name}); }; diff --git a/source/Ox.UI/js/Form/Button.js b/source/Ox.UI/js/Form/Button.js index 337bc284..a99c4fdf 100644 --- a/source/Ox.UI/js/Form/Button.js +++ b/source/Ox.UI/js/Form/Button.js @@ -152,7 +152,7 @@ Ox.Button = function(options, self) { function setTitle() { if (self.options.type == 'image') { that.attr({ - src: Ox.UI.getImageURL( + src: Ox.getImageURL( 'symbol' + self.options.title[0].toUpperCase() + self.options.title.slice(1), self.options.style == 'overlay' ? 'overlay' + ( diff --git a/source/Ox.UI/js/Form/FormPanel.js b/source/Ox.UI/js/Form/FormPanel.js index b6b3409c..dae885a3 100644 --- a/source/Ox.UI/js/Form/FormPanel.js +++ b/source/Ox.UI/js/Form/FormPanel.js @@ -31,7 +31,7 @@ Ox.FormPanel = function(options, self) { format: function(value) { return $('') .attr({ - src: Ox.UI.getImageURL('symbolCheck') + src: Ox.getImageURL('symbolCheck') }) .css({ width: '10px', diff --git a/source/Ox.UI/js/List/TableList.js b/source/Ox.UI/js/List/TableList.js index 4f308b53..eee9a0db 100644 --- a/source/Ox.UI/js/List/TableList.js +++ b/source/Ox.UI/js/List/TableList.js @@ -253,7 +253,7 @@ Ox.TableList = function(options, self) { tooltip: self.options.clearButtonTooltip }) .addClass('OxClear') - .attr({src: Ox.UI.getImageURL('symbolClose')}) + .attr({src: Ox.getImageURL('symbolClose')}) .css(Ox.UI.SCROLLBAR_SIZE == 16 ? { paddingLeft: '4px', paddingRight: '2px', @@ -467,7 +467,7 @@ Ox.TableList = function(options, self) { if (column.titleImage) { self.$titleImages[i] = $(''). attr({ - src: Ox.UI.getImageURL( + src: Ox.getImageURL( 'symbol' + Ox.toTitleCase(column.titleImage) ) }) @@ -478,7 +478,7 @@ Ox.TableList = function(options, self) { if (column.operator) { self.$orderImages[i] = $('') .attr({ - src: Ox.UI.getImageURL( + src: Ox.getImageURL( 'symbol' + (column.operator == '+' ? 'Up' : 'Down'), 'selected' ) @@ -909,7 +909,7 @@ Ox.TableList = function(options, self) { }); if (self.visibleColumns[pos].titleImage) { self.$titleImages[pos].attr({ - src: Ox.UI.getImageURL( + src: Ox.getImageURL( 'symbol' + Ox.toTitleCase(self.visibleColumns[pos].titleImage), isSelected ? 'selected' : '' ) @@ -952,14 +952,14 @@ Ox.TableList = function(options, self) { var $element = $(element), data = Ox.UI.getImageData($element.attr('src')); if (data && data.color == 'selected') { - $element.attr({src: Ox.UI.getImageURL(data.name, 'default')}); + $element.attr({src: Ox.getImageURL(data.name, 'default')}); } }); that.$body.find('.OxSelected img').each(function(i, element) { var $element = $(element), data = Ox.UI.getImageData($element.attr('src')); if (data && data.color == 'default') { - $element.attr({src: Ox.UI.getImageURL(data.name, 'selected')}); + $element.attr({src: Ox.getImageURL(data.name, 'selected')}); } }); } @@ -969,7 +969,7 @@ Ox.TableList = function(options, self) { pos = getColumnPositionById(id); if (pos > -1) { self.$orderImages[pos].attr({ - src: Ox.UI.getImageURL( + src: Ox.getImageURL( 'symbol' + (operator == '+' ? 'Up' : 'Down'), 'selected' ) diff --git a/source/Ox.UI/js/List/TreeList.js b/source/Ox.UI/js/List/TreeList.js index 8ab9eb40..73f5cda8 100644 --- a/source/Ox.UI/js/List/TreeList.js +++ b/source/Ox.UI/js/List/TreeList.js @@ -128,7 +128,7 @@ Ox.TreeList = function(options, self) { $icon = $('').attr({src: self.options.icon}); } } else { - $icon = $('').attr({src: Ox.UI.getImageURL( + $icon = $('').attr({src: Ox.getImageURL( 'symbol' + (expanded ? 'Down' : 'Right') )}); } diff --git a/source/Ox.UI/js/Video/BlockVideoTimeline.js b/source/Ox.UI/js/Video/BlockVideoTimeline.js index 5cafbd36..d27db5ce 100644 --- a/source/Ox.UI/js/Video/BlockVideoTimeline.js +++ b/source/Ox.UI/js/Video/BlockVideoTimeline.js @@ -81,7 +81,7 @@ Ox.BlockVideoTimeline = function(options, self) { self.$positionMarker = Ox.$('') .attr({ - src: Ox.UI.getImageURL('markerPosition') + src: Ox.getImageURL('markerPosition') }) .addClass('OxMarkerPosition') .appendTo(that); @@ -94,7 +94,7 @@ Ox.BlockVideoTimeline = function(options, self) { self.$pointMarker[point] = Ox.$('') .addClass('OxMarkerPoint' + titlecase) .attr({ - src: Ox.UI.getImageURL('marker' + titlecase) + src: Ox.getImageURL('marker' + titlecase) }) .appendTo(that); setPointMarker(point); diff --git a/source/Ox.UI/js/Video/LargeVideoTimeline.js b/source/Ox.UI/js/Video/LargeVideoTimeline.js index c264ec27..cbb9cb82 100644 --- a/source/Ox.UI/js/Video/LargeVideoTimeline.js +++ b/source/Ox.UI/js/Video/LargeVideoTimeline.js @@ -98,10 +98,10 @@ Ox.LargeVideoTimeline = function(options, self) { setTimeout(function() { var $cut = $('') .addClass('OxCut') - .attr({src: Ox.UI.getImageURL('markerCut')}), + .attr({src: Ox.getImageURL('markerCut')}), $chapter = $('') .addClass('OxChapter') - .attr({src: Ox.UI.getImageURL('markerChapter')}), + .attr({src: Ox.getImageURL('markerChapter')}), chapters = self.options.chapters.slice(1).map(function(chapter) { return chapter.position; }); @@ -115,7 +115,7 @@ Ox.LargeVideoTimeline = function(options, self) { self.$markerPosition = $('') .addClass('OxMarkerPosition') - .attr({src: Ox.UI.getImageURL('markerPosition')}) + .attr({src: Ox.getImageURL('markerPosition')}) .appendTo(that); setMarker(); @@ -124,7 +124,7 @@ Ox.LargeVideoTimeline = function(options, self) { var titlecase = Ox.toTitleCase(point); self.$pointMarker[point] = $('') .addClass('OxMarkerPoint' + titlecase) - .attr({src: Ox.UI.getImageURL('marker' + titlecase)}) + .attr({src: Ox.getImageURL('marker' + titlecase)}) .appendTo(self.$timeline); setPointMarker(point); }); diff --git a/source/Ox.UI/js/Video/SmallVideoTimeline.js b/source/Ox.UI/js/Video/SmallVideoTimeline.js index 11367f0b..bc7565db 100644 --- a/source/Ox.UI/js/Video/SmallVideoTimeline.js +++ b/source/Ox.UI/js/Video/SmallVideoTimeline.js @@ -127,7 +127,7 @@ Ox.SmallVideoTimeline = function(options, self) { self.$positionMarker = $('') .addClass('OxMarkerPosition') .attr({ - src: Ox.UI.getImageURL('markerPosition') + src: Ox.getImageURL('markerPosition') }) .appendTo(that); } @@ -140,7 +140,7 @@ Ox.SmallVideoTimeline = function(options, self) { self.$pointMarker[point] = $('') .addClass('OxMarkerPoint' + titlecase) .attr({ - src: Ox.UI.getImageURL('marker' + titlecase) + src: Ox.getImageURL('marker' + titlecase) }) .appendTo(that); setPointMarker(point); diff --git a/source/Ox.UI/js/Video/VideoPlayer.js b/source/Ox.UI/js/Video/VideoPlayer.js index 0080dbd2..46770b1a 100644 --- a/source/Ox.UI/js/Video/VideoPlayer.js +++ b/source/Ox.UI/js/Video/VideoPlayer.js @@ -552,7 +552,7 @@ Ox.VideoPlayer = function(options, self) { self.$playIcon = $('') .addClass('OxPlayIcon OxVideo') .attr({ - src: Ox.UI.getImageURL('symbol' + ( + src: Ox.getImageURL('symbol' + ( self.options.paused ? 'Play' : 'Pause' ), 'videoIcon') }) @@ -572,7 +572,7 @@ Ox.VideoPlayer = function(options, self) { }) .addClass('OxCensoredIcon OxVideo') .attr({ - src: Ox.UI.getImageURL( + src: Ox.getImageURL( 'symbol' + self.options.censoredIcon, 'videoIcon' ) }) @@ -609,7 +609,7 @@ Ox.VideoPlayer = function(options, self) { self.$pointMarker[point][edge] = $('') .addClass('OxPointMarker OxPointMarker' + titleCase) .attr({ - src: Ox.UI.getImageURL('marker' + titleCase) + src: Ox.getImageURL('marker' + titleCase) }) .appendTo(self.$videoContainer); }); @@ -2665,7 +2665,7 @@ Ox.VideoPlayer = function(options, self) { function togglePlayIcon() { self.$playIcon.attr({ - src: Ox.UI.getImageURL( + src: Ox.getImageURL( 'symbol' + (self.options.paused ? 'Play' : 'Pause' ), 'videoIcon') }); diff --git a/source/Ox.UI/js/Video/VideoPlayerMenu.js b/source/Ox.UI/js/Video/VideoPlayerMenu.js index 783eb363..df3e1def 100644 --- a/source/Ox.UI/js/Video/VideoPlayerMenu.js +++ b/source/Ox.UI/js/Video/VideoPlayerMenu.js @@ -24,7 +24,7 @@ Ox.VideoPlayerMenu = function(options, self) { return $item.data().group == group; }).forEach(function($item) { $($item.children()[1]).attr({ - src: Ox.UI.getImageURL('symbol' + ( + src: Ox.getImageURL('symbol' + ( $item.data().id == id ? 'Check' : 'None' )) }); @@ -62,7 +62,7 @@ Ox.VideoPlayerMenu = function(options, self) { } $('
').html(item.title).appendTo($item); $('').attr({ - src: Ox.UI.getImageURL( + src: Ox.getImageURL( 'symbol' + (item.checked ? 'Check' : 'None') ) }).appendTo($item);