From 2dc987fd224b754be93f1274a24f2f7a7f3e5e7d Mon Sep 17 00:00:00 2001 From: rolux Date: Thu, 25 Sep 2014 18:59:29 +0200 Subject: [PATCH] Ox.UI -> Ox --- static/js/URL.js | 2 +- static/js/apiDialog.js | 6 +++--- static/js/clipList.js | 2 +- static/js/contactForm.js | 2 +- static/js/contentPanel.js | 2 +- static/js/documentsPanel.js | 6 +++--- static/js/embedDialog.js | 8 ++++---- static/js/exportDialog.js | 2 +- static/js/filter.js | 8 ++++---- static/js/filterDialog.js | 6 +++--- static/js/folderBrowserList.js | 8 ++++---- static/js/folderList.js | 10 +++++----- static/js/helpDialog.js | 10 +++++----- static/js/idDialog.js | 2 +- static/js/infoView.0xdb.js | 2 +- static/js/insertEmbedDialog.js | 4 ++-- static/js/item.js | 2 +- static/js/list.js | 6 +++--- static/js/listDialog.js | 6 +++--- static/js/loadingIcon.js | 6 +++--- static/js/mediaView.js | 2 +- static/js/metadataDialog.js | 2 +- static/js/namesDialog.js | 4 ++-- static/js/navigationView.js | 14 +++++++------- static/js/printView.js | 2 +- static/js/sortElement.js | 2 +- static/js/statisticsDialog.js | 6 +++--- static/js/textPanel.js | 2 +- static/js/titlesDialog.js | 4 ++-- static/js/tv.js | 6 +++--- static/js/usersDialog.js | 8 ++++---- 31 files changed, 76 insertions(+), 76 deletions(-) diff --git a/static/js/URL.js b/static/js/URL.js index 7207954bc..f117090bc 100644 --- a/static/js/URL.js +++ b/static/js/URL.js @@ -423,7 +423,7 @@ pandora.URL = (function() { Ox.Request.cancel(); self.isPopState = true; $('.OxDialog:visible').each(function() { - Ox.UI.elements[$(this).data('oxid')].close(); + Ox.$elements[$(this).data('oxid')].close(); }); if (pandora.$ui.home) { pandora.UI.set({page: ''}); diff --git a/static/js/apiDialog.js b/static/js/apiDialog.js index ba49ba1e6..634e81333 100644 --- a/static/js/apiDialog.js +++ b/static/js/apiDialog.js @@ -35,10 +35,10 @@ pandora.ui.apiDialog = function() { keys: {escape: 'close'}, maximizeButton: true, minHeight: 256, - minWidth: 544 + Ox.UI.SCROLLBAR_SIZE, + minWidth: 544 + Ox.SCROLLBAR_SIZE, removeOnClose: true, title: Ox._('API Documentation'), - width: 672 + Ox.UI.SCROLLBAR_SIZE + width: 672 + Ox.SCROLLBAR_SIZE }) .bindEvent({ close: function() { @@ -73,7 +73,7 @@ pandora.ui.apiDialog = function() { { id: 'title', visible: true, - width: 128 - Ox.UI.SCROLLBAR_SIZE + width: 128 - Ox.SCROLLBAR_SIZE } ], items: items, diff --git a/static/js/clipList.js b/static/js/clipList.js index 84e034a5f..292bf13ae 100644 --- a/static/js/clipList.js +++ b/static/js/clipList.js @@ -195,7 +195,7 @@ pandora.ui.clipList = function(videoRatio) { if ($video) { // trigger singleclick $video.trigger('mousedown'); - Ox.UI.$window.trigger('mouseup'); + Ox.$window.trigger('mouseup'); } } that.closePreview(); diff --git a/static/js/contactForm.js b/static/js/contactForm.js index 4f77ce4ef..a80891d6e 100644 --- a/static/js/contactForm.js +++ b/static/js/contactForm.js @@ -154,7 +154,7 @@ pandora.ui.contactForm = function() { pandora.$ui.siteDialog ? parseInt(pandora.$ui.siteDialog.css('width')) : Math.round(window.innerWidth * 0.75) - ) - 304 - Ox.UI.SCROLLBAR_SIZE, 512); + ) - 304 - Ox.SCROLLBAR_SIZE, 512); } that.resizeElement = function() { diff --git a/static/js/contentPanel.js b/static/js/contentPanel.js index 66f560988..77a798ac7 100644 --- a/static/js/contentPanel.js +++ b/static/js/contentPanel.js @@ -25,7 +25,7 @@ pandora.ui.contentPanel = function() { collapsed: !pandora.user.ui.showBrowser, collapsible: true, element: pandora.$ui.browser = pandora.ui.browser(), - size: 112 + Ox.UI.SCROLLBAR_SIZE, + size: 112 + Ox.SCROLLBAR_SIZE, tooltip: Ox._('{0} browser', [Ox._(pandora.site.itemName.singular.toLowerCase())]) + ' ' + Ox.SYMBOLS.SHIFT + 'B' diff --git a/static/js/documentsPanel.js b/static/js/documentsPanel.js index 990a3e043..f8f2dce9d 100644 --- a/static/js/documentsPanel.js +++ b/static/js/documentsPanel.js @@ -465,7 +465,7 @@ pandora.ui.documentsPanel = function(options) { function getPreviewSize() { var ratio = $list.value($list.options('selected')[0], 'ratio'), - size = ui.documentSize - 16 - Ox.UI.SCROLLBAR_SIZE, + size = ui.documentSize - 16 - Ox.SCROLLBAR_SIZE, height = ratio > 1 ? size / ratio : size, width = ratio > 1 ? size : size * ratio, left = Math.floor((size - width) / 2); @@ -523,7 +523,7 @@ pandora.ui.documentsPanel = function(options) { || pandora.site.capabilities.canEditDocuments[pandora.user.level] || options.editable, labelWidth = 80, - width = ui.documentSize - 16 - Ox.UI.SCROLLBAR_SIZE; + width = ui.documentSize - 16 - Ox.SCROLLBAR_SIZE; return isItemView ? Ox.Element() .css({textAlign: 'center'}) @@ -778,7 +778,7 @@ pandora.ui.documentsPanel = function(options) { function resizeItem() { var size = getPreviewSize(), - width = ui.documentSize - 16 - Ox.UI.SCROLLBAR_SIZE; + width = ui.documentSize - 16 - Ox.SCROLLBAR_SIZE; $preview && $preview.options({ height: size.height, width: size.width diff --git a/static/js/embedDialog.js b/static/js/embedDialog.js index de118d00b..bcba8fd91 100644 --- a/static/js/embedDialog.js +++ b/static/js/embedDialog.js @@ -14,9 +14,9 @@ pandora.ui.embedDialog = function(/*[url, ]callback*/) { formWidth = 612, iframeHeight = Ox.last(pandora.site.video.resolutions), iframeWidth = Math.round(iframeHeight * pandora.site.video.previewRatio), - listWidth = 128 + Ox.UI.SCROLLBAR_SIZE, + listWidth = 128 + Ox.SCROLLBAR_SIZE, labelWidth = 192, - dialogWidth = listWidth + formWidth + 32 + Ox.UI.SCROLLBAR_SIZE, + dialogWidth = listWidth + formWidth + 32 + Ox.SCROLLBAR_SIZE, dialogHeight = 384, linkPlaceholder = '...', options = {}, @@ -107,7 +107,7 @@ pandora.ui.embedDialog = function(/*[url, ]callback*/) { { id: 'title', visible: true, - width: 128 - Ox.UI.SCROLLBAR_SIZE + width: 128 - Ox.SCROLLBAR_SIZE } ], items: views, @@ -143,7 +143,7 @@ pandora.ui.embedDialog = function(/*[url, ]callback*/) { $panel = Ox.SplitPanel({ elements: [ - {element: $list, size: 128 + Ox.UI.SCROLLBAR_SIZE}, + {element: $list, size: 128 + Ox.SCROLLBAR_SIZE}, {element: $form} ], orientation: 'horizontal' diff --git a/static/js/exportDialog.js b/static/js/exportDialog.js index 04226a94f..d89deb541 100644 --- a/static/js/exportDialog.js +++ b/static/js/exportDialog.js @@ -7,7 +7,7 @@ pandora.ui.exportDialog = function(options) { style: 'square', type: 'textarea', value: options.data, - width: 512 - Ox.UI.SCROLLBAR_SIZE + width: 512 - Ox.SCROLLBAR_SIZE }), that = Ox.Dialog({ diff --git a/static/js/filter.js b/static/js/filter.js index c50258b6e..f63a367ef 100644 --- a/static/js/filter.js +++ b/static/js/filter.js @@ -35,7 +35,7 @@ pandora.ui.filter = function(id) { .addClass('flagname') .css({ float: 'left', - width: pandora.user.ui.filterSizes[i] - 68 - Ox.UI.SCROLLBAR_SIZE, + width: pandora.user.ui.filterSizes[i] - 68 - Ox.SCROLLBAR_SIZE, textOverflow: 'ellipsis', overflowX: 'hidden' }) @@ -46,7 +46,7 @@ pandora.ui.filter = function(id) { operator: filter.type == 'string' ? '+' : '-', title: title, visible: true, - width: pandora.user.ui.filterSizes[i] - 44 - Ox.UI.SCROLLBAR_SIZE + width: pandora.user.ui.filterSizes[i] - 44 - Ox.SCROLLBAR_SIZE }, { align: 'right', @@ -184,7 +184,7 @@ pandora.ui.filter = function(id) { ], type: 'image', }) - .css(Ox.UI.SCROLLBAR_SIZE == 16 ? { + .css(Ox.SCROLLBAR_SIZE == 16 ? { right: 0, width: '14px' } : { @@ -254,7 +254,7 @@ pandora.ui.filter = function(id) { } }) .appendTo(that.$bar); - Ox.UI.SCROLLBAR_SIZE < 16 && $($menu.find('input')[0]).css({ + Ox.SCROLLBAR_SIZE < 16 && $($menu.find('input')[0]).css({ marginRight: '-3px', marginTop: '1px', width: '8px', diff --git a/static/js/filterDialog.js b/static/js/filterDialog.js index 785087132..d80cc016f 100644 --- a/static/js/filterDialog.js +++ b/static/js/filterDialog.js @@ -43,14 +43,14 @@ pandora.ui.filterDialog = function() { }) ], content: pandora.$ui.filterForm = pandora.ui.filterForm({mode: 'find'}), - maxWidth: 648 + Ox.UI.SCROLLBAR_SIZE, + maxWidth: 648 + Ox.SCROLLBAR_SIZE, minHeight: 264, - minWidth: 648 + Ox.UI.SCROLLBAR_SIZE, + minWidth: 648 + Ox.SCROLLBAR_SIZE, height: 264, // keys: {enter: 'save', escape: 'cancel'}, removeOnClose: true, title: Ox._('Advanced Find'), - width: 648 + Ox.UI.SCROLLBAR_SIZE + width: 648 + Ox.SCROLLBAR_SIZE }), $updateCheckbox = Ox.Checkbox({ diff --git a/static/js/folderBrowserList.js b/static/js/folderBrowserList.js index 81c8ad1b0..daac61e55 100644 --- a/static/js/folderBrowserList.js +++ b/static/js/folderBrowserList.js @@ -5,7 +5,7 @@ pandora.ui.folderBrowserList = function(id, section) { // but resizeFolders will set them to different widths section = pandora.user.ui.section; var ui = pandora.user.ui, - columnWidth = (ui.sidebarSize - Ox.UI.SCROLLBAR_SIZE - (section != 'texts' ? 96 : 48)) / 2, + columnWidth = (ui.sidebarSize - Ox.SCROLLBAR_SIZE - (section != 'texts' ? 96 : 48)) / 2, i = Ox.getIndexById(pandora.site.sectionFolders[section], id), folderItems = section == 'items' ? 'Lists' : Ox.toTitleCase(section), folderItem = folderItems.slice(0, -1), @@ -27,7 +27,7 @@ pandora.ui.folderBrowserList = function(id, section) { /* format: function() { return $('').attr({ - src: Ox.UI.getImageURL('symbolIcon') + src: Ox.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.UI.getImageURL( + src: Ox.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.UI.getImageURL( + src: Ox.getImageURL( 'symbol' + (id == 'favorite' ? 'Like' : 'Star') ) }) diff --git a/static/js/folderList.js b/static/js/folderList.js index 054909a29..78f56a1fa 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.UI.getImageURL( + src: Ox.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.UI.getImageURL( + src: Ox.getImageURL( 'symbol' + symbols[id] ) }) @@ -171,7 +171,7 @@ pandora.ui.folderList = function(id, section) { { format: function() { return $('').attr({ - src: Ox.UI.getImageURL('symbolVolume') + src: Ox.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.UI.getImageURL(data.mounted ? 'symbolSync' : 'symbolEdit') + src: Ox.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.UI.getImageURL('symbolMount') + src: Ox.getImageURL('symbolMount') }) .css({ width: '10px', diff --git a/static/js/helpDialog.js b/static/js/helpDialog.js index 6f52e7b2c..cbd515166 100644 --- a/static/js/helpDialog.js +++ b/static/js/helpDialog.js @@ -33,10 +33,10 @@ pandora.ui.helpDialog = function() { keys: {escape: 'close'}, maximizeButton: true, minHeight: 256, - minWidth: 544 + 2 * Ox.UI.SCROLLBAR_SIZE, + minWidth: 544 + 2 * Ox.SCROLLBAR_SIZE, removeOnClose: true, title: Ox._('Help'), - width: 672 + 2 * Ox.UI.SCROLLBAR_SIZE + width: 672 + 2 * Ox.SCROLLBAR_SIZE }) .bindEvent({ close: function() { @@ -78,7 +78,7 @@ pandora.ui.helpDialog = function() { { id: 'title', visible: true, - width: 128 - Ox.UI.SCROLLBAR_SIZE + width: 128 - Ox.SCROLLBAR_SIZE } ], items: pandora.site.help.map(function(value, index) { @@ -107,7 +107,7 @@ pandora.ui.helpDialog = function() { $panel = Ox.SplitPanel({ elements: [ - {element: $list, size: 128 + Ox.UI.SCROLLBAR_SIZE}, + {element: $list, size: 128 + Ox.SCROLLBAR_SIZE}, {element: $text} ], orientation: 'horizontal' @@ -120,7 +120,7 @@ pandora.ui.helpDialog = function() { }); function getImageSize() { - var width = that.options('width') - 160 - 2 * Ox.UI.SCROLLBAR_SIZE, + var width = that.options('width') - 160 - 2 * Ox.SCROLLBAR_SIZE, height = Math.round(width * 5/8); return {width: width, height: height}; } diff --git a/static/js/idDialog.js b/static/js/idDialog.js index cf9b630f0..8103100d5 100644 --- a/static/js/idDialog.js +++ b/static/js/idDialog.js @@ -63,7 +63,7 @@ pandora.ui.idDialog = function(data) { getIds(); function getFormWidth() { - return dialogWidth - 32 - Ox.UI.SCROLLBAR_SIZE; + return dialogWidth - 32 - Ox.SCROLLBAR_SIZE; } function getIds() { diff --git a/static/js/infoView.0xdb.js b/static/js/infoView.0xdb.js index 501420d43..de9ff4463 100644 --- a/static/js/infoView.0xdb.js +++ b/static/js/infoView.0xdb.js @@ -22,7 +22,7 @@ pandora.ui.infoView = function(data) { iconLeft = iconSize == 256 ? Math.floor((iconSize - iconWidth) / 2) : 0, borderRadius = ui.icons == 'posters' ? 0 : iconSize / 8, isEditable = canEdit && data.id.slice(0, 2) == '0x', - listWidth = 144 + Ox.UI.SCROLLBAR_SIZE, + listWidth = 144 + Ox.SCROLLBAR_SIZE, margin = 16, statisticsWidth = 128, diff --git a/static/js/insertEmbedDialog.js b/static/js/insertEmbedDialog.js index dc1fe588a..2fbce71e3 100644 --- a/static/js/insertEmbedDialog.js +++ b/static/js/insertEmbedDialog.js @@ -10,8 +10,8 @@ pandora.ui.insertEmbedDialog = function(/*[url, ]callback*/) { var advanced = pandora.user.ui.showAdvancedEmbedOptions, dialogHeight = 344, - dialogWidth = 416 + Ox.UI.SCROLLBAR_SIZE, - formWidth = dialogWidth - 32 - Ox.UI.SCROLLBAR_SIZE, + dialogWidth = 416 + Ox.SCROLLBAR_SIZE, + formWidth = dialogWidth - 32 - Ox.SCROLLBAR_SIZE, that = Ox.Dialog({ buttons: [ diff --git a/static/js/item.js b/static/js/item.js index a8102c324..64a7887a3 100644 --- a/static/js/item.js +++ b/static/js/item.js @@ -115,7 +115,7 @@ pandora.ui.item = function() { pandora.$ui.item = Ox.TreeList({ data: result.data, - width: pandora.$ui.mainPanel.size(1) - Ox.UI.SCROLLBAR_SIZE + width: pandora.$ui.mainPanel.size(1) - Ox.SCROLLBAR_SIZE }); pandora.$ui.contentPanel.replaceElement(1, Ox.Container().append(pandora.$ui.item) diff --git a/static/js/list.js b/static/js/list.js index d807901f7..b9f28d955 100644 --- a/static/js/list.js +++ b/static/js/list.js @@ -249,7 +249,7 @@ pandora.ui.list = function() { unique: 'id', width: window.innerWidth - ui.showSidebar * ui.sidebarSize - 1 - - Ox.UI.SCROLLBAR_SIZE + - Ox.SCROLLBAR_SIZE }) .addClass('OxMedia') .bindEvent({ @@ -541,10 +541,10 @@ pandora.ui.list = function() { // fixme: doesn't update title icon, passes useless options if (hasIcons()) { if (ui.listView == 'list') { - src = Ox.UI.getImageURL( + src = Ox.getImageURL( data.value == 'posters' ? 'symbolSetPoster' : 'symbolIcon' ); - previousSrc = Ox.UI.getImageURL( + previousSrc = Ox.getImageURL( data.previousValue == 'posters' ? 'symbolSetPoster' : 'symbolIcon' ); that.find('img[src="' + previousSrc + '"]').attr({src: src}); diff --git a/static/js/listDialog.js b/static/js/listDialog.js index 5a8a76650..e8e50b165 100644 --- a/static/js/listDialog.js +++ b/static/js/listDialog.js @@ -84,7 +84,7 @@ pandora.ui.listDialog = function(section) { changeOnKeypress: true, clear: true, placeholder: Ox._('Find: All'), - width: 128 + Ox.UI.SCROLLBAR_SIZE + width: 128 + Ox.SCROLLBAR_SIZE }) .bindEvent({ change: function(data) { @@ -148,7 +148,7 @@ pandora.ui.listDialog = function(section) { function getWidth(section) { return section == 'general' ? 496 - : (section == 'icon' ? 696 : 648) + Ox.UI.SCROLLBAR_SIZE; + : (section == 'icon' ? 696 : 648) + Ox.SCROLLBAR_SIZE; } return $dialog; @@ -386,7 +386,7 @@ pandora.ui.listIconPanel = function(listData) { }, { element: $list, - size: 144 + Ox.UI.SCROLLBAR_SIZE + size: 144 + Ox.SCROLLBAR_SIZE } ], orientation: 'horizontal' diff --git a/static/js/loadingIcon.js b/static/js/loadingIcon.js index 926534c5a..cbdfccf00 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.UI.getImageURL('symbolRedo') + src: Ox.getImageURL('symbolRedo') }) .css(getCSS('stop')) .bindEvent({ @@ -23,7 +23,7 @@ pandora.ui.loadingIcon = function() { if (!self.loadingInterval) { that.css(getCSS('start')) .attr({ - src: Ox.UI.getImageURL('symbolLoading') + src: Ox.getImageURL('symbolLoading') }); that.superStart(); } @@ -34,7 +34,7 @@ pandora.ui.loadingIcon = function() { that.superStop(function() { that.css(getCSS('stop')) .attr({ - src: Ox.UI.getImageURL('symbolRedo') + src: Ox.getImageURL('symbolRedo') }); }); } diff --git a/static/js/mediaView.js b/static/js/mediaView.js index 51f3260e3..8e7ebec69 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.UI.getImageURL('symbol' + ({ + src: Ox.getImageURL('symbol' + ({ 'available': 'Check', 'encoding': 'Sync', 'failed': 'Warning', diff --git a/static/js/metadataDialog.js b/static/js/metadataDialog.js index 34cce7b16..b28f8459f 100644 --- a/static/js/metadataDialog.js +++ b/static/js/metadataDialog.js @@ -162,7 +162,7 @@ pandora.ui.metadataDialog = function(data) { } function getFormWidth() { - return dialogWidth - 32 - Ox.UI.SCROLLBAR_SIZE; + return dialogWidth - 32 - Ox.SCROLLBAR_SIZE; } function getMetadata() { diff --git a/static/js/namesDialog.js b/static/js/namesDialog.js index 76bb58723..63bc3b191 100644 --- a/static/js/namesDialog.js +++ b/static/js/namesDialog.js @@ -5,7 +5,7 @@ pandora.ui.namesDialog = function() { // FIXME: add cache invalidation var height = Math.round((window.innerHeight - 48) * 0.9), - width = 576 + Ox.UI.SCROLLBAR_SIZE, + width = 576 + Ox.SCROLLBAR_SIZE, $findInput = Ox.Input({ changeOnKeypress: true, @@ -162,7 +162,7 @@ pandora.ui.namesDialog = function() { }) .bindEvent({ resizeend: function(data) { - var width = (data.width - 64 - Ox.UI.SCROLLBAR_SIZE) / 2; + var width = (data.width - 64 - Ox.SCROLLBAR_SIZE) / 2; [ {id: 'name', width: Math.ceil(width)}, {id: 'sortname', width: Math.floor(width)} diff --git a/static/js/navigationView.js b/static/js/navigationView.js index e4740c5cc..019cd37b0 100644 --- a/static/js/navigationView.js +++ b/static/js/navigationView.js @@ -8,9 +8,9 @@ pandora.ui.navigationView = function(type, videoRatio) { isEmbed = pandora.isEmbedURL(), itemName = type == 'map' ? 'place' : 'event', listSizes = [ - 144 + Ox.UI.SCROLLBAR_SIZE, - 280 + Ox.UI.SCROLLBAR_SIZE, - 416 + Ox.UI.SCROLLBAR_SIZE + 144 + Ox.SCROLLBAR_SIZE, + 280 + Ox.SCROLLBAR_SIZE, + 416 + Ox.SCROLLBAR_SIZE ], listSize = listSizes[ui.clipColumns - 1], @@ -112,7 +112,7 @@ pandora.ui.navigationView = function(type, videoRatio) { }, { element: $listPanel, - size: 188 + Ox.UI.SCROLLBAR_SIZE + size: 188 + Ox.SCROLLBAR_SIZE } ], orientation: 'vertical' @@ -127,7 +127,7 @@ pandora.ui.navigationView = function(type, videoRatio) { // 20 px menu + 24 px toolbar + 1px resizbar + 16px statusbar (if !item) height: isEmbed ? window.innerHeight - 40 : !ui.item ? window.innerHeight - ui.showFilters * ui.filtersSize - 61 - : window.innerHeight - ui.showBrowser * (112 + Ox.UI.SCROLLBAR_SIZE) - 45, + : window.innerHeight - ui.showBrowser * (112 + Ox.SCROLLBAR_SIZE) - 45, places: function(data, callback) { var itemsQuery; if (!ui.item) { @@ -190,7 +190,7 @@ pandora.ui.navigationView = function(type, videoRatio) { // 20 px menu + 24 px toolbar + 1px resizbar + 16px statusbar (if !item) height: !ui.item ? window.innerHeight - ui.showFilters * ui.filtersSize - 61 - : window.innerHeight - ui.showBrowser * (112 + Ox.UI.SCROLLBAR_SIZE) - 45, + : window.innerHeight - ui.showBrowser * (112 + Ox.SCROLLBAR_SIZE) - 45, range: [-5000, 5000], selected: ui.calendarSelection, showControls: ui.showCalendarControls, @@ -253,7 +253,7 @@ pandora.ui.navigationView = function(type, videoRatio) { } function getSortSelectWidth(width) { - return Math.min(144, width - 32 + Ox.UI.SCROLLBAR_SIZE); + return Math.min(144, width - 32 + Ox.SCROLLBAR_SIZE); } function updateStatusbar(items) { diff --git a/static/js/printView.js b/static/js/printView.js index f875c3798..b7923aae1 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.UI.getImageURL('symbolLoadingAnimated', null, 'oxlight') + src: Ox.getImageURL('symbolLoadingAnimated', null, 'oxlight') }); Ox.$body.css({ background: 'rgb(255, 255, 255)', diff --git a/static/js/sortElement.js b/static/js/sortElement.js index 5d336e001..a39b0ec93 100644 --- a/static/js/sortElement.js +++ b/static/js/sortElement.js @@ -25,7 +25,7 @@ pandora.ui.sortElement = function(isNavigationView) { $sortSelect = Ox.Select({ items: items, value: ui[sortKey][0].key, - width: !isEmbed && isNavigationView && ui.clipColumns == 1 ? 120 + Ox.UI.SCROLLBAR_SIZE : 144 + width: !isEmbed && isNavigationView && ui.clipColumns == 1 ? 120 + Ox.SCROLLBAR_SIZE : 144 }) .bindEvent({ change: function(data) { diff --git a/static/js/statisticsDialog.js b/static/js/statisticsDialog.js index 56fc1bc99..a835a1bf7 100644 --- a/static/js/statisticsDialog.js +++ b/static/js/statisticsDialog.js @@ -179,7 +179,7 @@ pandora.ui.statisticsDialog = function() { $tabPanel = Ox.TabPanel({ content: function(id) { - var chartWidth = dialogWidth - 32 - Ox.UI.SCROLLBAR_SIZE, + var chartWidth = dialogWidth - 32 - Ox.SCROLLBAR_SIZE, mode = $guestsCheckbox.options('value') ? 'all' : 'registered', top = 16, $content = Ox.Element() @@ -381,7 +381,7 @@ pandora.ui.statisticsDialog = function() { ).append( $('') .attr({ - src: Ox.UI.PATH + 'png/' + key + src: Ox.UI_PATH + 'png/' + key + name.replace(/ /g, '') + '128.png' }) .css({ @@ -457,7 +457,7 @@ pandora.ui.statisticsDialog = function() { $element.append( $('') .attr({ - src: Ox.UI.PATH + 'png/' + key + src: Ox.UI_PATH + 'png/' + key + value.replace(/ /g, '') + '128.png' }) .css({ diff --git a/static/js/textPanel.js b/static/js/textPanel.js index c2f494261..1492147d8 100644 --- a/static/js/textPanel.js +++ b/static/js/textPanel.js @@ -395,7 +395,7 @@ pandora.ui.textHTML = function(text) { return window.innerWidth - pandora.user.ui.showSidebar * pandora.user.ui.sidebarSize - 1 - pandora.user.ui.embedSize - 1 - - 32 - Ox.UI.SCROLLBAR_SIZE; + - 32 - Ox.SCROLLBAR_SIZE; } function scrollTo(position) { diff --git a/static/js/titlesDialog.js b/static/js/titlesDialog.js index 372e9d5cd..5615176e1 100644 --- a/static/js/titlesDialog.js +++ b/static/js/titlesDialog.js @@ -3,7 +3,7 @@ pandora.ui.titlesDialog = function() { var height = Math.round((window.innerHeight - 48) * 0.9), - width = 512 + Ox.UI.SCROLLBAR_SIZE, + width = 512 + Ox.SCROLLBAR_SIZE, $findInput = Ox.Input({ changeOnKeypress: true, @@ -151,7 +151,7 @@ pandora.ui.titlesDialog = function() { }) .bindEvent({ resizeend: function(data) { - var width = (data.width - Ox.UI.SCROLLBAR_SIZE) / 2; + var width = (data.width - Ox.SCROLLBAR_SIZE) / 2; [ {id: 'title', width: Math.ceil(width)}, {id: 'sorttitle', width: Math.floor(width)} diff --git a/static/js/tv.js b/static/js/tv.js index f35cf01a9..2749a0f3d 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.UI.getImageURL('symbolLoadingAnimated')}) + .attr({src: Ox.getImageURL('symbolLoadingAnimated')}) .css({ position: 'absolute', left: 0, top: 0, right: 0, bottom: 0, @@ -169,7 +169,7 @@ pandora.ui.tv = function() { } that.fadeInScreen = function() { - that.appendTo(Ox.UI.$body).animate({opacity: 1}, 500); + that.appendTo(Ox.$body).animate({opacity: 1}, 500); play(); return that; }; @@ -195,7 +195,7 @@ pandora.ui.tv = function() { }; that.showScreen = function() { - that.css({opacity: 1}).appendTo(Ox.UI.$body); + that.css({opacity: 1}).appendTo(Ox.$body); play(); return that; }; diff --git a/static/js/usersDialog.js b/static/js/usersDialog.js index 179bf4fdc..486369d80 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.UI.getImageURL('symbolCheck') + src: Ox.getImageURL('symbolCheck') }) .css({ width: '10px', @@ -123,7 +123,7 @@ pandora.ui.usersDialog = function() { format: function(value) { return $('') .attr({ - src: Ox.UI.getImageURL('symbolMail') + src: Ox.getImageURL('symbolMail') }) .css({ width: '10px', @@ -222,7 +222,7 @@ pandora.ui.usersDialog = function() { .replace(/Windows (NT \d+\.\d+) \((.+)\)/, 'Windows $2 ($1)') }) .attr({ - src: Ox.UI.PATH + 'png/system' + src: Ox.UI_PATH + 'png/system' + system.replace(/ /g, '') + '128.png' }) .css({ @@ -253,7 +253,7 @@ pandora.ui.usersDialog = function() { tooltip: value }) .attr({ - src: Ox.UI.PATH + 'png/browser' + src: Ox.UI_PATH + 'png/browser' + browser.replace(/ /g, '') + '128.png' }) .css({