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

Fixed extended menu items starting from 3rd level and below not expanding vertically as expected (fixes #1778)

Browse Source
This commit is contained in:
Djamil Legato
2017-01-24 17:12:41 -08:00
parent 7e7cf295c8
commit 8ec9dc61b5
3 changed files with 35 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG.md
+1
View File
@@ -14,6 +14,7 @@
- Fixed wrong ordering of custom CSS/JS assets
- Fixed nested field selector in `collection.list` loosing its value when you edit all items (#1817)
- Helium: Updated OwlCarousel, fixed a bug when OwlCarousel disappeared when only 1 item was set (#1801)
- Fixed extended menu items starting from 3rd level and below not expanding vertically as expected (#1778)
2. [Joomla](#joomla)
2. [](#improved)
- Allow previously hardcoded module and component wrappers to be overridden
assets/common/application/menu/index.js
+17 -4
View File
@@ -247,18 +247,31 @@ var Menu = new prime({
_fixHeights: function(parent, sublevel, isGoingBack, isNavMenu) {
if (parent == sublevel) { return; }
if (isGoingBack) { parent.attribute('style', null); }
if (isGoingBack) {
parent.attribute('style', null);
}
var heights = {
var parents, heights = {
from: parent[0].getBoundingClientRect(),
to: (!isNavMenu ? sublevel.parent('.g-dropdown')[0] : sublevel[0]).getBoundingClientRect()
},
height = Math.max(heights.from.height, heights.to.height);
if (isGoingBack) {
parents = parent.parents('[style^="height"]');
(parents || []).forEach(function(element) { element.style.height = heights.from.height + 'px'; });
}
if (!isGoingBack) {
// if from height is < than to height set the parent height else, set the target
if (heights.from.height < heights.to.height) { parent[0].style.height = height + 'px'; }
else if (isNavMenu) { sublevel[0].style.height = height + 'px'; }
if (heights.from.height < heights.to.height) {
parent[0].style.height = height + 'px';
parents = parent.parents('[style^="height"]');
(parents || []).forEach(function(element) { element.style.height = height + 'px'; });
} else if (isNavMenu) {
sublevel[0].style.height = height + 'px';
}
// fix sublevels heights in side menu (offcanvas etc)
if (!isNavMenu) {
assets/common/js/main.js
Vendored
+17 -4
View File
@@ -273,18 +273,31 @@ var Menu = new prime({
_fixHeights: function(parent, sublevel, isGoingBack, isNavMenu) {
if (parent == sublevel) { return; }
if (isGoingBack) { parent.attribute('style', null); }
if (isGoingBack) {
parent.attribute('style', null);
}
var heights = {
var parents, heights = {
from: parent[0].getBoundingClientRect(),
to: (!isNavMenu ? sublevel.parent('.g-dropdown')[0] : sublevel[0]).getBoundingClientRect()
},
height = Math.max(heights.from.height, heights.to.height);
if (isGoingBack) {
parents = parent.parents('[style^="height"]');
(parents || []).forEach(function(element) { element.style.height = heights.from.height + 'px'; });
}
if (!isGoingBack) {
// if from height is < than to height set the parent height else, set the target
if (heights.from.height < heights.to.height) { parent[0].style.height = height + 'px'; }
else if (isNavMenu) { sublevel[0].style.height = height + 'px'; }
if (heights.from.height < heights.to.height) {
parent[0].style.height = height + 'px';
parents = parent.parents('[style^="height"]');
(parents || []).forEach(function(element) { element.style.height = height + 'px'; });
} else if (isNavMenu) {
sublevel[0].style.height = height + 'px';
}
// fix sublevels heights in side menu (offcanvas etc)
if (!isNavMenu) {