From b4222951a97d35ff0863e04f19b9c9fcb91c08f7 Mon Sep 17 00:00:00 2001
From: Djamil Legato <djamil@djamil.it>
Date: Tue, 27 Jun 2017 17:08:27 -0700
Subject: [PATCH] Menu: Fixed frontend menu 'Extended' option, resetting
 heights of wrapping containers not necessarily related to the menu itself
 (fixes #2025)

---
 CHANGELOG.md                            |  1 +
 assets/common/application/menu/index.js | 14 ++++++++++++--
 assets/common/js/main.js                | 14 ++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a846073d7..c614bcf55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 1. [Common](#common)
     3. [](#bugfix)
         - Menu: Disable Dropdowns still Shows Indicator (#2031)
+        - Menu: Fixed frontend menu 'Extended' option, resetting heights of wrapping containers not necessarily related to the menu itself (#2025) 
 3. [WordPress](#wordpress)
     1. [](#new)
         - Updated Timber to v1.3.2
diff --git a/assets/common/application/menu/index.js b/assets/common/application/menu/index.js
index 239dab249..14f9f9b7c 100644
--- a/assets/common/application/menu/index.js
+++ b/assets/common/application/menu/index.js
@@ -259,7 +259,12 @@ var Menu = new prime({
 
         if (isGoingBack) {
             parents = parent.parents('[style^="height"]');
-            (parents || []).forEach(function(element) { element.style.height = heights.from.height + 'px'; });
+            (parents || []).forEach(function(element) {
+                element = $(element);
+                if (element.parent('.g-toplevel')) {
+                    element[0].style.height = heights.from.height + 'px';
+                }
+            });
         }
 
         if (!isGoingBack) {
@@ -268,7 +273,12 @@ var Menu = new prime({
                 parent[0].style.height = height + 'px';
 
                 parents = parent.parents('[style^="height"]');
-                (parents || []).forEach(function(element) { element.style.height = height + 'px'; });
+                (parents || []).forEach(function(element) {
+                    element = $(element);
+                    if (element.parent('.g-toplevel')) {
+                        element[0].style.height = height + 'px';
+                    }
+                });
             } else if (isNavMenu) {
                 sublevel[0].style.height = height + 'px';
             }
diff --git a/assets/common/js/main.js b/assets/common/js/main.js
index 3a1da420a..134617fc7 100644
--- a/assets/common/js/main.js
+++ b/assets/common/js/main.js
@@ -285,7 +285,12 @@ var Menu = new prime({
 
         if (isGoingBack) {
             parents = parent.parents('[style^="height"]');
-            (parents || []).forEach(function(element) { element.style.height = heights.from.height + 'px'; });
+            (parents || []).forEach(function(element) {
+                element = $(element);
+                if (element.parent('.g-toplevel')) {
+                    element[0].style.height = heights.from.height + 'px';
+                }
+            });
         }
 
         if (!isGoingBack) {
@@ -294,7 +299,12 @@ var Menu = new prime({
                 parent[0].style.height = height + 'px';
 
                 parents = parent.parents('[style^="height"]');
-                (parents || []).forEach(function(element) { element.style.height = height + 'px'; });
+                (parents || []).forEach(function(element) {
+                    element = $(element);
+                    if (element.parent('.g-toplevel')) {
+                        element[0].style.height = height + 'px';
+                    }
+                });
             } else if (isNavMenu) {
                 sublevel[0].style.height = height + 'px';
             }