diff --git a/static/js/pandora/info.js b/static/js/pandora/info.js index dd0f7740..6b0e5909 100644 --- a/static/js/pandora/info.js +++ b/static/js/pandora/info.js @@ -45,14 +45,19 @@ pandora.ui.info = function() { function resizeInfo() { var height = pandora.getInfoHeight(true); Ox.print('RESIZE INFO', ui.showInfo, height) + pandora.$ui.leftPanel.size(2, height); + pandora.resizeFolders(); + !ui.showInfo && pandora.$ui.leftPanel.css({bottom: -height + 'px'}); + /* if (ui.showInfo) { pandora.$ui.leftPanel.size(2, height, function() { pandora.resizeFolders(); }); } else { - pandora.$ui.leftPanel.css({bottom: -height}); + pandora.$ui.leftPanel.css({bottom: -height + 'px'}); pandora.resizeFolders(); } + */ } function updateInfo() { diff --git a/static/js/pandora/leftPanel.js b/static/js/pandora/leftPanel.js index ed2ef96d..9ea33df0 100644 --- a/static/js/pandora/leftPanel.js +++ b/static/js/pandora/leftPanel.js @@ -34,7 +34,7 @@ pandora.ui.leftPanel = function() { pandora.$ui.sectionbar.append(pandora.$ui.sectionButtons = pandora.ui.sectionButtons()); } pandora.$ui.leftPanel.size(2, infoHeight); - !pandora.user.ui.showInfo && pandora.$ui.leftPanel.css({bottom: -infoHeight}); + !pandora.user.ui.showInfo && pandora.$ui.leftPanel.css({bottom: -infoHeight + 'px'}); pandora.resizeFolders(); pandora.$ui.info.resizeInfo(); }, diff --git a/static/js/pandora/utils.js b/static/js/pandora/utils.js index 69ed247f..448de44e 100644 --- a/static/js/pandora/utils.js +++ b/static/js/pandora/utils.js @@ -467,10 +467,9 @@ pandora.getFoldersHeight = function() { pandora.getFoldersWidth = function() { var width = pandora.user.ui.sidebarSize; - // fixme: don't use height(), look up in splitpanels if ( pandora.$ui.appPanel - && pandora.getFoldersHeight() > pandora.$ui.leftPanel.height() - 24 - 1 - pandora.$ui.info.height() + && pandora.getFoldersHeight() > window.innerHeight - 20 - 24 - 1 - pandora.getInfoHeight() ) { width -= Ox.UI.SCROLLBAR_SIZE; }