From 3a764b38f9e7bc8b88c101c68f59fdc12b9e5875 Mon Sep 17 00:00:00 2001 From: rolux Date: Fri, 26 Sep 2014 14:30:51 +0200 Subject: [PATCH] Ox -> Ox.UI --- static/js/UI.js | 2 +- static/js/embed/pandora.js | 4 ++-- static/js/folderBrowserList.js | 6 +++--- static/js/folderList.js | 10 +++++----- static/js/list.js | 4 ++-- static/js/loadingIcon.js | 6 +++--- static/js/mediaView.js | 2 +- static/js/printView.js | 2 +- static/js/tv.js | 2 +- static/js/usersDialog.js | 4 ++-- static/js/utils.js | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/static/js/UI.js b/static/js/UI.js index 02a878a8d..a16ad0211 100644 --- a/static/js/UI.js +++ b/static/js/UI.js @@ -241,7 +241,7 @@ pandora.UI = (function() { triggerEvents && Ox.forEach(trigger, function(val, key) { Ox.Log('UI', 'TRIGGER ', key, val); Ox.forEach(pandora.$ui, function($element) { - if (Ox.isOxElement($element)) { + if (Ox.UI.isElement($element)) { $element.triggerEvent('pandora_' + key.toLowerCase(), { value: val, previousValue: self.previousUI[key] diff --git a/static/js/embed/pandora.js b/static/js/embed/pandora.js index 55290a6cf..20032cd32 100755 --- a/static/js/embed/pandora.js +++ b/static/js/embed/pandora.js @@ -103,7 +103,7 @@ Ox.load('UI', { } }) ); - Ox.hideScreen(); + Ox.UI.hideScreen(); }); return that; }, @@ -111,7 +111,7 @@ Ox.load('UI', { var that = Ox.Element(); pandora.user.ui.item = options.item; pandora.api.get({id: options.item, keys: videoKeys}, function(result) { - Ox.hideScreen(); + Ox.UI.hideScreen(); var data = getVideoOptions(result.data), ui = pandora.user.ui; that.append(pandora.player = Ox.VideoTimelinePlayer({ diff --git a/static/js/folderBrowserList.js b/static/js/folderBrowserList.js index 3ad027440..81c8ad1b0 100644 --- a/static/js/folderBrowserList.js +++ b/static/js/folderBrowserList.js @@ -27,7 +27,7 @@ pandora.ui.folderBrowserList = function(id, section) { /* format: function() { return $('').attr({ - src: Ox.getImageURL('symbolIcon') + src: Ox.UI.getImageURL('symbolIcon') }).css({ width: '10px', height: '10px', @@ -78,7 +78,7 @@ pandora.ui.folderBrowserList = function(id, section) { format: function(value, data) { return $('') .attr({ - src: Ox.getImageURL( + src: Ox.UI.getImageURL( value == 'static' ? 'symbolClick' : value == 'smart' ? 'symbolFind' : value == 'html' ? 'symbolFile' @@ -110,7 +110,7 @@ pandora.ui.folderBrowserList = function(id, section) { format: function(value) { return $('') .attr({ - src: Ox.getImageURL( + src: Ox.UI.getImageURL( 'symbol' + (id == 'favorite' ? 'Like' : 'Star') ) }) diff --git a/static/js/folderList.js b/static/js/folderList.js index 78f56a1fa..054909a29 100644 --- a/static/js/folderList.js +++ b/static/js/folderList.js @@ -88,7 +88,7 @@ pandora.ui.folderList = function(id, section) { format: function(value, data) { return $('') .attr({ - src: Ox.getImageURL( + src: Ox.UI.getImageURL( value == 'static' ? 'symbolClick' : value == 'smart' ? 'symbolFind' : value == 'html' ? 'symbolFile' @@ -120,7 +120,7 @@ pandora.ui.folderList = function(id, section) { var symbols = {personal: 'Publish', favorite: 'Like', featured: 'Star'}; return $('') .attr({ - src: Ox.getImageURL( + src: Ox.UI.getImageURL( 'symbol' + symbols[id] ) }) @@ -171,7 +171,7 @@ pandora.ui.folderList = function(id, section) { { format: function() { return $('').attr({ - src: Ox.getImageURL('symbolVolume') + src: Ox.UI.getImageURL('symbolVolume') }).css({ width: '10px', height: '10px', @@ -206,7 +206,7 @@ pandora.ui.folderList = function(id, section) { format: function(value, data) { return $('') .attr({ - src: Ox.getImageURL(data.mounted ? 'symbolSync' : 'symbolEdit') + src: Ox.UI.getImageURL(data.mounted ? 'symbolSync' : 'symbolEdit') }) .css({ width: '10px', @@ -227,7 +227,7 @@ pandora.ui.folderList = function(id, section) { format: function(value, data) { return $('') .attr({ - src: Ox.getImageURL('symbolMount') + src: Ox.UI.getImageURL('symbolMount') }) .css({ width: '10px', diff --git a/static/js/list.js b/static/js/list.js index 7446dcc63..456e73326 100644 --- a/static/js/list.js +++ b/static/js/list.js @@ -547,10 +547,10 @@ pandora.ui.list = function() { // fixme: doesn't update title icon, passes useless options if (hasIcons()) { if (ui.listView == 'list') { - src = Ox.getImageURL( + src = Ox.UI.getImageURL( data.value == 'posters' ? 'symbolSetPoster' : 'symbolIcon' ); - previousSrc = Ox.getImageURL( + previousSrc = Ox.UI.getImageURL( data.previousValue == 'posters' ? 'symbolSetPoster' : 'symbolIcon' ); that.find('img[src="' + previousSrc + '"]').attr({src: src}); diff --git a/static/js/loadingIcon.js b/static/js/loadingIcon.js index cbdfccf00..926534c5a 100644 --- a/static/js/loadingIcon.js +++ b/static/js/loadingIcon.js @@ -7,7 +7,7 @@ pandora.ui.loadingIcon = function() { tooltip: Ox._('Click to reload {0}', [pandora.site.site.name]) }, self) .attr({ - src: Ox.getImageURL('symbolRedo') + src: Ox.UI.getImageURL('symbolRedo') }) .css(getCSS('stop')) .bindEvent({ @@ -23,7 +23,7 @@ pandora.ui.loadingIcon = function() { if (!self.loadingInterval) { that.css(getCSS('start')) .attr({ - src: Ox.getImageURL('symbolLoading') + src: Ox.UI.getImageURL('symbolLoading') }); that.superStart(); } @@ -34,7 +34,7 @@ pandora.ui.loadingIcon = function() { that.superStop(function() { that.css(getCSS('stop')) .attr({ - src: Ox.getImageURL('symbolRedo') + src: Ox.UI.getImageURL('symbolRedo') }); }); } diff --git a/static/js/mediaView.js b/static/js/mediaView.js index 8e7ebec69..51f3260e3 100644 --- a/static/js/mediaView.js +++ b/static/js/mediaView.js @@ -85,7 +85,7 @@ pandora.ui.mediaView = function(options) { ? 1 : 0; return $('') .attr({ - src: Ox.getImageURL('symbol' + ({ + src: Ox.UI.getImageURL('symbol' + ({ 'available': 'Check', 'encoding': 'Sync', 'failed': 'Warning', diff --git a/static/js/printView.js b/static/js/printView.js index b7923aae1..f875c3798 100644 --- a/static/js/printView.js +++ b/static/js/printView.js @@ -12,7 +12,7 @@ pandora.ui.printView = function(data) { ); $($loading.find('img')[0]).attr({ - src: Ox.getImageURL('symbolLoadingAnimated', null, 'oxlight') + src: Ox.UI.getImageURL('symbolLoadingAnimated', null, 'oxlight') }); Ox.$body.css({ background: 'rgb(255, 255, 255)', diff --git a/static/js/tv.js b/static/js/tv.js index 2749a0f3d..dbbf8dff1 100644 --- a/static/js/tv.js +++ b/static/js/tv.js @@ -54,7 +54,7 @@ pandora.ui.tv = function() { function play() { var $loading = $('') - .attr({src: Ox.getImageURL('symbolLoadingAnimated')}) + .attr({src: Ox.UI.getImageURL('symbolLoadingAnimated')}) .css({ position: 'absolute', left: 0, top: 0, right: 0, bottom: 0, diff --git a/static/js/usersDialog.js b/static/js/usersDialog.js index 486369d80..4dd26533c 100644 --- a/static/js/usersDialog.js +++ b/static/js/usersDialog.js @@ -101,7 +101,7 @@ pandora.ui.usersDialog = function() { format: function(value, data) { return $('') .attr({ - src: Ox.getImageURL('symbolCheck') + src: Ox.UI.getImageURL('symbolCheck') }) .css({ width: '10px', @@ -123,7 +123,7 @@ pandora.ui.usersDialog = function() { format: function(value) { return $('') .attr({ - src: Ox.getImageURL('symbolMail') + src: Ox.UI.getImageURL('symbolMail') }) .css({ width: '10px', diff --git a/static/js/utils.js b/static/js/utils.js index 4456b4467..15e47342b 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -769,7 +769,7 @@ pandora.enableDragAndDrop = function($list, canMove, section) { }) .append( $('') - .attr({src: Ox.getImageURL(image)}) + .attr({src: Ox.UI.getImageURL(image)}) .css({width: '16px', height: '16px'}) ) )