IntenseWebs/gantry5
3
0
Fork 0
mirror of https://github.com/gantry/gantry5.git synced 2026-08-19 01:15:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Do not try to animate all columns if it's desktop megamenu

Browse Source
This commit is contained in:
Djamil Legato
2015-04-17 15:24:24 -07:00
parent eb28a08606
commit 5d7487081e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/common/application/menu/index.js
+3 -2
View File
@@ -137,8 +137,9 @@ var Menu = new prime({
blocks; blocks;
if (sublevel) { if (sublevel) {
if (target.parent(selectors.mainContainer) && !sublevel.hasClass('g-toplevel')) { this._fixHeights(sublevel, slideout, isGoingBack); } var isNavMenu = target.parent(selectors.mainContainer);
if (columns && (blocks = columns.search('> .g-grid > .g-block'))) { if (isNavMenu && !sublevel.hasClass('g-toplevel')) { this._fixHeights(sublevel, slideout, isGoingBack); }
if (!isNavMenu && columns && (blocks = columns.search('> .g-grid > .g-block'))) {
if (blocks.length > 1) { sublevel = blocks.search('> .g-sublevel'); } if (blocks.length > 1) { sublevel = blocks.search('> .g-sublevel'); }
} }
assets/common/js/main.js
+3 -2
View File
@@ -159,8 +159,9 @@ var Menu = new prime({
blocks; blocks;
if (sublevel) { if (sublevel) {
if (target.parent(selectors.mainContainer) && !sublevel.hasClass('g-toplevel')) { this._fixHeights(sublevel, slideout, isGoingBack); } var isNavMenu = target.parent(selectors.mainContainer);
if (columns && (blocks = columns.search('> .g-grid > .g-block'))) { if (isNavMenu && !sublevel.hasClass('g-toplevel')) { this._fixHeights(sublevel, slideout, isGoingBack); }
if (!isNavMenu && columns && (blocks = columns.search('> .g-grid > .g-block'))) {
if (blocks.length > 1) { sublevel = blocks.search('> .g-sublevel'); } if (blocks.length > 1) { sublevel = blocks.search('> .g-sublevel'); }
} }