diff --git a/static/js/apiDialog.js b/static/js/apiDialog.js index 634e8133..ba49ba1e 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.SCROLLBAR_SIZE, + minWidth: 544 + Ox.UI.SCROLLBAR_SIZE, removeOnClose: true, title: Ox._('API Documentation'), - width: 672 + Ox.SCROLLBAR_SIZE + width: 672 + Ox.UI.SCROLLBAR_SIZE }) .bindEvent({ close: function() { @@ -73,7 +73,7 @@ pandora.ui.apiDialog = function() { { id: 'title', visible: true, - width: 128 - Ox.SCROLLBAR_SIZE + width: 128 - Ox.UI.SCROLLBAR_SIZE } ], items: items, diff --git a/static/js/contactForm.js b/static/js/contactForm.js index a80891d6..4f77ce4e 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.SCROLLBAR_SIZE, 512); + ) - 304 - Ox.UI.SCROLLBAR_SIZE, 512); } that.resizeElement = function() { diff --git a/static/js/contentPanel.js b/static/js/contentPanel.js index c63774ee..cbb012d9 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.SCROLLBAR_SIZE, + size: 112 + Ox.UI.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 0c64e6de..ffc63dcf 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.SCROLLBAR_SIZE, + size = ui.documentSize - 16 - Ox.UI.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.SCROLLBAR_SIZE; + width = ui.documentSize - 16 - Ox.UI.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.SCROLLBAR_SIZE; + width = ui.documentSize - 16 - Ox.UI.SCROLLBAR_SIZE; $preview && $preview.options({ height: size.height, width: size.width diff --git a/static/js/editPanel.js b/static/js/editPanel.js index 52532042..29d166d1 100644 --- a/static/js/editPanel.js +++ b/static/js/editPanel.js @@ -5,9 +5,9 @@ pandora.ui.editPanel = function(isEmbed) { var ui = pandora.user.ui, edit, listSizes = [ - 144 + Ox.SCROLLBAR_SIZE, - 280 + Ox.SCROLLBAR_SIZE, - 416 + Ox.SCROLLBAR_SIZE + 144 + Ox.UI.SCROLLBAR_SIZE, + 280 + Ox.UI.SCROLLBAR_SIZE, + 416 + Ox.UI.SCROLLBAR_SIZE ], listSize = listSizes[ui.clipColumns], smallTimelineCanvas, diff --git a/static/js/embedDialog.js b/static/js/embedDialog.js index bcba8fd9..de118d00 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.SCROLLBAR_SIZE, + listWidth = 128 + Ox.UI.SCROLLBAR_SIZE, labelWidth = 192, - dialogWidth = listWidth + formWidth + 32 + Ox.SCROLLBAR_SIZE, + dialogWidth = listWidth + formWidth + 32 + Ox.UI.SCROLLBAR_SIZE, dialogHeight = 384, linkPlaceholder = '...', options = {}, @@ -107,7 +107,7 @@ pandora.ui.embedDialog = function(/*[url, ]callback*/) { { id: 'title', visible: true, - width: 128 - Ox.SCROLLBAR_SIZE + width: 128 - Ox.UI.SCROLLBAR_SIZE } ], items: views, @@ -143,7 +143,7 @@ pandora.ui.embedDialog = function(/*[url, ]callback*/) { $panel = Ox.SplitPanel({ elements: [ - {element: $list, size: 128 + Ox.SCROLLBAR_SIZE}, + {element: $list, size: 128 + Ox.UI.SCROLLBAR_SIZE}, {element: $form} ], orientation: 'horizontal' diff --git a/static/js/exportDialog.js b/static/js/exportDialog.js index d89deb54..04226a94 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.SCROLLBAR_SIZE + width: 512 - Ox.UI.SCROLLBAR_SIZE }), that = Ox.Dialog({ diff --git a/static/js/filter.js b/static/js/filter.js index f63a367e..c50258b6 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.SCROLLBAR_SIZE, + width: pandora.user.ui.filterSizes[i] - 68 - Ox.UI.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.SCROLLBAR_SIZE + width: pandora.user.ui.filterSizes[i] - 44 - Ox.UI.SCROLLBAR_SIZE }, { align: 'right', @@ -184,7 +184,7 @@ pandora.ui.filter = function(id) { ], type: 'image', }) - .css(Ox.SCROLLBAR_SIZE == 16 ? { + .css(Ox.UI.SCROLLBAR_SIZE == 16 ? { right: 0, width: '14px' } : { @@ -254,7 +254,7 @@ pandora.ui.filter = function(id) { } }) .appendTo(that.$bar); - Ox.SCROLLBAR_SIZE < 16 && $($menu.find('input')[0]).css({ + Ox.UI.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 d80cc016..78508713 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.SCROLLBAR_SIZE, + maxWidth: 648 + Ox.UI.SCROLLBAR_SIZE, minHeight: 264, - minWidth: 648 + Ox.SCROLLBAR_SIZE, + minWidth: 648 + Ox.UI.SCROLLBAR_SIZE, height: 264, // keys: {enter: 'save', escape: 'cancel'}, removeOnClose: true, title: Ox._('Advanced Find'), - width: 648 + Ox.SCROLLBAR_SIZE + width: 648 + Ox.UI.SCROLLBAR_SIZE }), $updateCheckbox = Ox.Checkbox({ diff --git a/static/js/folderBrowserList.js b/static/js/folderBrowserList.js index daac61e5..3ad02744 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.SCROLLBAR_SIZE - (section != 'texts' ? 96 : 48)) / 2, + columnWidth = (ui.sidebarSize - Ox.UI.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), diff --git a/static/js/helpDialog.js b/static/js/helpDialog.js index cbd51516..6f52e7b2 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.SCROLLBAR_SIZE, + minWidth: 544 + 2 * Ox.UI.SCROLLBAR_SIZE, removeOnClose: true, title: Ox._('Help'), - width: 672 + 2 * Ox.SCROLLBAR_SIZE + width: 672 + 2 * Ox.UI.SCROLLBAR_SIZE }) .bindEvent({ close: function() { @@ -78,7 +78,7 @@ pandora.ui.helpDialog = function() { { id: 'title', visible: true, - width: 128 - Ox.SCROLLBAR_SIZE + width: 128 - Ox.UI.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.SCROLLBAR_SIZE}, + {element: $list, size: 128 + Ox.UI.SCROLLBAR_SIZE}, {element: $text} ], orientation: 'horizontal' @@ -120,7 +120,7 @@ pandora.ui.helpDialog = function() { }); function getImageSize() { - var width = that.options('width') - 160 - 2 * Ox.SCROLLBAR_SIZE, + var width = that.options('width') - 160 - 2 * Ox.UI.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 8103100d..cf9b630f 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.SCROLLBAR_SIZE; + return dialogWidth - 32 - Ox.UI.SCROLLBAR_SIZE; } function getIds() { diff --git a/static/js/infoView.0xdb.js b/static/js/infoView.0xdb.js index de9ff446..501420d4 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.SCROLLBAR_SIZE, + listWidth = 144 + Ox.UI.SCROLLBAR_SIZE, margin = 16, statisticsWidth = 128, diff --git a/static/js/insertEmbedDialog.js b/static/js/insertEmbedDialog.js index 2fbce71e..dc1fe588 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.SCROLLBAR_SIZE, - formWidth = dialogWidth - 32 - Ox.SCROLLBAR_SIZE, + dialogWidth = 416 + Ox.UI.SCROLLBAR_SIZE, + formWidth = dialogWidth - 32 - Ox.UI.SCROLLBAR_SIZE, that = Ox.Dialog({ buttons: [ diff --git a/static/js/item.js b/static/js/item.js index 64a7887a..a8102c32 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.SCROLLBAR_SIZE + width: pandora.$ui.mainPanel.size(1) - Ox.UI.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 7cbffc22..7446dcc6 100644 --- a/static/js/list.js +++ b/static/js/list.js @@ -246,7 +246,7 @@ pandora.ui.list = function() { unique: 'id', width: window.innerWidth - ui.showSidebar * ui.sidebarSize - 1 - - Ox.SCROLLBAR_SIZE + - Ox.UI.SCROLLBAR_SIZE }) .addClass('OxMedia') .bindEvent({ diff --git a/static/js/listDialog.js b/static/js/listDialog.js index e8e50b16..5a8a7665 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.SCROLLBAR_SIZE + width: 128 + Ox.UI.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.SCROLLBAR_SIZE; + : (section == 'icon' ? 696 : 648) + Ox.UI.SCROLLBAR_SIZE; } return $dialog; @@ -386,7 +386,7 @@ pandora.ui.listIconPanel = function(listData) { }, { element: $list, - size: 144 + Ox.SCROLLBAR_SIZE + size: 144 + Ox.UI.SCROLLBAR_SIZE } ], orientation: 'horizontal' diff --git a/static/js/metadataDialog.js b/static/js/metadataDialog.js index b28f8459..34cce7b1 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.SCROLLBAR_SIZE; + return dialogWidth - 32 - Ox.UI.SCROLLBAR_SIZE; } function getMetadata() { diff --git a/static/js/namesDialog.js b/static/js/namesDialog.js index 63bc3b19..76bb5872 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.SCROLLBAR_SIZE, + width = 576 + Ox.UI.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.SCROLLBAR_SIZE) / 2; + var width = (data.width - 64 - Ox.UI.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 48b74e85..86328306 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.SCROLLBAR_SIZE, - 280 + Ox.SCROLLBAR_SIZE, - 416 + Ox.SCROLLBAR_SIZE + 144 + Ox.UI.SCROLLBAR_SIZE, + 280 + Ox.UI.SCROLLBAR_SIZE, + 416 + Ox.UI.SCROLLBAR_SIZE ], listSize = listSizes[ui.clipColumns - 1], @@ -112,7 +112,7 @@ pandora.ui.navigationView = function(type, videoRatio) { }, { element: $listPanel, - size: 188 + Ox.SCROLLBAR_SIZE + size: 188 + Ox.UI.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.SCROLLBAR_SIZE) - 45, + : window.innerHeight - ui.showBrowser * (112 + Ox.UI.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.SCROLLBAR_SIZE) - 45, + : window.innerHeight - ui.showBrowser * (112 + Ox.UI.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.SCROLLBAR_SIZE); + return Math.min(144, width - 32 + Ox.UI.SCROLLBAR_SIZE); } function updateStatusbar(items) { diff --git a/static/js/sortElement.js b/static/js/sortElement.js index a39b0ec9..5d336e00 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.SCROLLBAR_SIZE : 144 + width: !isEmbed && isNavigationView && ui.clipColumns == 1 ? 120 + Ox.UI.SCROLLBAR_SIZE : 144 }) .bindEvent({ change: function(data) { diff --git a/static/js/statisticsDialog.js b/static/js/statisticsDialog.js index a835a1bf..48fc6e8c 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.SCROLLBAR_SIZE, + var chartWidth = dialogWidth - 32 - Ox.UI.SCROLLBAR_SIZE, mode = $guestsCheckbox.options('value') ? 'all' : 'registered', top = 16, $content = Ox.Element() diff --git a/static/js/textPanel.js b/static/js/textPanel.js index 1492147d..c2f49426 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.SCROLLBAR_SIZE; + - 32 - Ox.UI.SCROLLBAR_SIZE; } function scrollTo(position) { diff --git a/static/js/titlesDialog.js b/static/js/titlesDialog.js index 5615176e..372e9d5c 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.SCROLLBAR_SIZE, + width = 512 + Ox.UI.SCROLLBAR_SIZE, $findInput = Ox.Input({ changeOnKeypress: true, @@ -151,7 +151,7 @@ pandora.ui.titlesDialog = function() { }) .bindEvent({ resizeend: function(data) { - var width = (data.width - Ox.SCROLLBAR_SIZE) / 2; + var width = (data.width - Ox.UI.SCROLLBAR_SIZE) / 2; [ {id: 'title', width: Math.ceil(width)}, {id: 'sorttitle', width: Math.floor(width)} diff --git a/static/js/utils.js b/static/js/utils.js index ebf8267b..4456b446 100644 --- a/static/js/utils.js +++ b/static/js/utils.js @@ -818,7 +818,7 @@ pandora.enterFullscreen = function() { pandora.user.ui.showSidebar && pandora.$ui.mainPanel.size(0, 0); pandora.$ui.rightPanel.size(0, 0).size(2, 0); !pandora.user.ui.showBrowser && pandora.$ui.contentPanel.css({ - top: (-112 - Ox.SCROLLBAR_SIZE) + 'px' // fixme: rightPanel.size(0, 0) doesn't preserve negative top of browser + top: (-112 - Ox.UI.SCROLLBAR_SIZE) + 'px' // fixme: rightPanel.size(0, 0) doesn't preserve negative top of browser }); pandora.user.ui.showBrowser && pandora.$ui.contentPanel.size(0, 0); pandora.$ui.player.options({ @@ -832,9 +832,9 @@ pandora.exitFullscreen = function() { pandora.user.ui.showSidebar && pandora.$ui.mainPanel.size(0, pandora.user.ui.sidebarSize); pandora.$ui.rightPanel.size(0, 24).size(2, 16); !pandora.user.ui.showBrowser && pandora.$ui.contentPanel.css({ - top: 24 + (-112 - Ox.SCROLLBAR_SIZE) + 'px' // fixme: rightPanel.size(0, 0) doesn't preserve negative top of browser + top: 24 + (-112 - Ox.UI.SCROLLBAR_SIZE) + 'px' // fixme: rightPanel.size(0, 0) doesn't preserve negative top of browser }); - pandora.user.ui.showBrowser && pandora.$ui.contentPanel.size(0, 112 + Ox.SCROLLBAR_SIZE); + pandora.user.ui.showBrowser && pandora.$ui.contentPanel.size(0, 112 + Ox.UI.SCROLLBAR_SIZE); }; pandora.getAllItemsTitle = function(section) { @@ -873,7 +873,7 @@ pandora.getClipItems = function(data) { pandora.getClipsItems = function(width) { width = width || window.innerWidth - pandora.user.ui.showSidebar * pandora.user.ui.sidebarSize - 1 - - Ox.SCROLLBAR_SIZE; + - Ox.UI.SCROLLBAR_SIZE; return Math.floor((width - 8) / (128 + 8)) - 1; }; @@ -1039,7 +1039,7 @@ pandora.getFoldersWidth = function(section) { && pandora.getFoldersHeight(section) > window.innerHeight - 20 - 24 - 16 - 1 - pandora.getInfoHeight(section) ) { - width -= Ox.SCROLLBAR_SIZE; + width -= Ox.UI.SCROLLBAR_SIZE; } return width; }; @@ -2067,9 +2067,9 @@ pandora.resizeFilters = function(width) { .size(0, pandora.user.ui.filterSizes[1]) .size(2, pandora.user.ui.filterSizes[3]); pandora.$ui.filters && pandora.$ui.filters.forEach(function($list, i) { - $list.resizeColumn('name', pandora.user.ui.filterSizes[i] - 44 - Ox.SCROLLBAR_SIZE); + $list.resizeColumn('name', pandora.user.ui.filterSizes[i] - 44 - Ox.UI.SCROLLBAR_SIZE); if (pandora.site.flags) { - $list.find('.flagname').css({width: pandora.user.ui.filterSizes[i] - 68 - Ox.SCROLLBAR_SIZE}) + $list.find('.flagname').css({width: pandora.user.ui.filterSizes[i] - 68 - Ox.UI.SCROLLBAR_SIZE}) } }); }; @@ -2126,7 +2126,7 @@ pandora.resizeWindow = function() { pandora.$ui.list.options({ width: window.innerWidth - pandora.user.ui.showSidebar * pandora.user.ui.sidebarSize - 1 - - Ox.SCROLLBAR_SIZE + - Ox.UI.SCROLLBAR_SIZE }); if (clipsItems != previousClipsItems) { Ox.Request.clearCache(); // fixme @@ -2136,7 +2136,7 @@ pandora.resizeWindow = function() { pandora.$ui.list.options({ width: window.innerWidth - pandora.user.ui.showSidebar * pandora.user.ui.sidebarSize - 1 - - Ox.SCROLLBAR_SIZE + - Ox.UI.SCROLLBAR_SIZE }); } else if (pandora.user.ui.listView == 'map') { pandora.$ui.map && pandora.$ui.map.resizeMap();