From 66314f7c0003f743bbff8851b8d2bbeb58140ee5 Mon Sep 17 00:00:00 2001 From: Djamil Legato Date: Fri, 17 Apr 2015 14:43:30 -0700 Subject: [PATCH] Do no try to fix heights on top levels in megamenu --- assets/common/application/menu/index.js | 2 +- assets/common/js/main.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/common/application/menu/index.js b/assets/common/application/menu/index.js index 1747825d3..610cc85a2 100644 --- a/assets/common/application/menu/index.js +++ b/assets/common/application/menu/index.js @@ -137,7 +137,7 @@ var Menu = new prime({ blocks; if (sublevel) { - if (target.parent(selectors.mainContainer)) { this._fixHeights(sublevel, slideout, isGoingBack); } + if (target.parent(selectors.mainContainer) && !sublevel.hasClass('g-toplevel')) { this._fixHeights(sublevel, slideout, isGoingBack); } if (columns && (blocks = columns.search('> .g-grid > .g-block'))) { if (blocks.length > 1) { sublevel = blocks.search('> .g-sublevel'); } } diff --git a/assets/common/js/main.js b/assets/common/js/main.js index c4528eb36..9046d8d58 100644 --- a/assets/common/js/main.js +++ b/assets/common/js/main.js @@ -159,7 +159,7 @@ var Menu = new prime({ blocks; if (sublevel) { - if (target.parent(selectors.mainContainer)) { this._fixHeights(sublevel, slideout, isGoingBack); } + if (target.parent(selectors.mainContainer) && !sublevel.hasClass('g-toplevel')) { this._fixHeights(sublevel, slideout, isGoingBack); } if (columns && (blocks = columns.search('> .g-grid > .g-block'))) { if (blocks.length > 1) { sublevel = blocks.search('> .g-sublevel'); } }