From 8b29732291a0fe118781cf10d466299ef2b846fa Mon Sep 17 00:00:00 2001 From: David Craig Date: Mon, 25 May 2015 16:06:47 +1200 Subject: [PATCH] Fix left nav styling. - Incorrent collapsed state on reload, when 'flush' param is not present. - The content area had a horizontal scroll in split-mode. --- admin/javascript/LeftAndMain.Menu.js | 8 ++++++++ admin/javascript/LeftAndMain.js | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/admin/javascript/LeftAndMain.Menu.js b/admin/javascript/LeftAndMain.Menu.js index 3fcc56b50..ba49269cc 100644 --- a/admin/javascript/LeftAndMain.Menu.js +++ b/admin/javascript/LeftAndMain.Menu.js @@ -139,6 +139,14 @@ onadd: function () { var self = this; + setTimeout(function () { + // Use a timeout so this happens after the redraw. + // Triggering a toggle before redraw will result in an incorrect + // menu 'expanded width' being calculated when then menu + // is added in a collapsed state. + self.togglePanel(!self.getEvaluatedCollapsedState(), false, false); + }, 0); + // Setup automatic expand / collapse behaviour. $(window).on('ajaxComplete', function (e) { setTimeout(function () { // Use a timeout so this happens after the redraw diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index 565dddd5e..054373a39 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -221,7 +221,7 @@ jQuery.noConflict(); * See LeftAndMain.Layout.js for description of these options. */ LayoutOptions: { - minContentWidth: 820, + minContentWidth: 940, minPreviewWidth: 400, mode: 'content' },