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 some cases where the height calculation of columns sublevels was wrong in offcanvas menu (fixes #540)

Browse Source
This commit is contained in:
Djamil Legato
2015-07-08 10:29:26 -07:00
parent d9bca54f0a
commit b993c801a0
2 changed files with 40 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/common/application/menu/index.js
+20 -4
View File
@@ -234,7 +234,7 @@ var Menu = new prime({
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 { sublevel[0].style.height = height + 'px'; }
else if (isNavMenu) { sublevel[0].style.height = height + 'px'; }
// fix sublevels heights in side menu (offcanvas etc)
if (!isNavMenu) {
@@ -242,11 +242,27 @@ var Menu = new prime({
block = $(sublevel).parent('.g-block:not(.size-100)'),
column = block ? block.parent('.g-dropdown-column') : null;
(sublevel.parents('.g-slide-out, .g-dropdown-column') || parent).forEach(function(slideout) {
maxHeight = Math.max(height, parseInt(slideout.style.height, 10));
maxHeight = Math.max(height, parseInt(slideout.style.height || 0, 10));
});
if (column) { column[0].style.height = maxHeight + 'px'; }
sublevel[0].style.height = maxHeight + 'px';
if (column) {
column[0].style.height = maxHeight + 'px';
var blocks = column.search('> .g-grid > .g-block'),
diff = maxHeight;
blocks.forEach(function(block, i){
if ((i + 1) != blocks.length) {
diff -= block.getBoundingClientRect().height;
} else {
$(block).find('.g-sublevel')[0].style.height = diff + 'px';
}
});
} else {
sublevel[0].style.height = maxHeight + 'px';
}
}
}
},
assets/common/js/main.js
Vendored
+20 -4
View File
@@ -257,7 +257,7 @@ var Menu = new prime({
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 { sublevel[0].style.height = height + 'px'; }
else if (isNavMenu) { sublevel[0].style.height = height + 'px'; }
// fix sublevels heights in side menu (offcanvas etc)
if (!isNavMenu) {
@@ -265,11 +265,27 @@ var Menu = new prime({
block = $(sublevel).parent('.g-block:not(.size-100)'),
column = block ? block.parent('.g-dropdown-column') : null;
(sublevel.parents('.g-slide-out, .g-dropdown-column') || parent).forEach(function(slideout) {
maxHeight = Math.max(height, parseInt(slideout.style.height, 10));
maxHeight = Math.max(height, parseInt(slideout.style.height || 0, 10));
});
if (column) { column[0].style.height = maxHeight + 'px'; }
sublevel[0].style.height = maxHeight + 'px';
if (column) {
column[0].style.height = maxHeight + 'px';
var blocks = column.search('> .g-grid > .g-block'),
diff = maxHeight;
blocks.forEach(function(block, i){
if ((i + 1) != blocks.length) {
diff -= block.getBoundingClientRect().height;
} else {
$(block).find('.g-sublevel')[0].style.height = diff + 'px';
}
});
} else {
sublevel[0].style.height = maxHeight + 'px';
}
}
}
},