From 6273a8af8209462b315f494051fe417cfb34a500 Mon Sep 17 00:00:00 2001 From: Brian Canini <canini.16@osu.edu> Date: Fri, 19 Nov 2021 09:05:03 -0500 Subject: [PATCH] mobile javascript updates for sidebars --- web/themes/asc_bootstrap/js/scripts.js | 36 +++++++++++++++++--------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/web/themes/asc_bootstrap/js/scripts.js b/web/themes/asc_bootstrap/js/scripts.js index 10ae0eda5c..e7b4c32ea5 100644 --- a/web/themes/asc_bootstrap/js/scripts.js +++ b/web/themes/asc_bootstrap/js/scripts.js @@ -23,28 +23,40 @@ jQuery(document).ready(function(){ jQuery(".path-people .main-container aside").css({'min-height':(jQuery(".path-people .main-container section").height()+'px')}); } - if(jQuery(".page-node-type-newsletter-article .main-container section").height() > jQuery(".page-node-type-newsletter-article .main-container aside").height()) { - jQuery(".page-node-type-newsletter-article .main-container aside").css({'min-height':(jQuery(".page-node-type-newsletter-article .main-container section").height()+'px')}); + if (jQuery(".page-node-type-newsletter-article .main-container aside .region-sidebar-menu").css('display') != 'none') { + if(jQuery(".page-node-type-newsletter-article .main-container section").height() > jQuery(".page-node-type-newsletter-article .main-container aside").height()) { + jQuery(".page-node-type-newsletter-article .main-container aside").css({'min-height':(jQuery(".page-node-type-newsletter-article .main-container section").height()+'px')}); + } } - if(jQuery(".page-node-type-research .main-container section").height() > jQuery(".page-node-type-research aside").height()) { - jQuery(".page-node-type-research .main-container aside").css({'min-height':(jQuery(".page-node-type-research .main-container section").height()+'px')}); + if (jQuery(".page-node-type-research .main-container aside .region-sidebar-menu").css('display') != 'none') { + if(jQuery(".page-node-type-research .main-container section").height() > jQuery(".page-node-type-research aside").height()) { + jQuery(".page-node-type-research .main-container aside").css({'min-height':(jQuery(".page-node-type-research .main-container section").height()+'px')}); + } } - if(jQuery(".page-node-type-gallery .main-container section").height() > jQuery(".page-node-type-gallery aside").height()) { - jQuery(".page-node-type-gallery .main-container aside").css({'min-height':(jQuery(".page-node-type-gallery .main-container section").height()+'px')}); + if (jQuery(".page-node-type-gallery .main-container aside .region-sidebar-menu").css('display') != 'none') { + if(jQuery(".page-node-type-gallery .main-container section").height() > jQuery(".page-node-type-gallery aside").height()) { + jQuery(".page-node-type-gallery .main-container aside").css({'min-height':(jQuery(".page-node-type-gallery .main-container section").height()+'px')}); + } } - if(jQuery(".page-node-type-course .main-container section").height() > jQuery(".page-node-type-course aside").height()) { - jQuery(".page-node-type-course .main-container aside").css({'min-height':(jQuery(".page-node-type-course .main-container section").height()+'px')}); + if (jQuery(".page-node-type-course .main-container aside .region-sidebar-menu").css('display') != 'none') { + if(jQuery(".page-node-type-course .main-container section").height() > jQuery(".page-node-type-course aside").height()) { + jQuery(".page-node-type-course .main-container aside").css({'min-height':(jQuery(".page-node-type-course .main-container section").height()+'px')}); + } } - if(jQuery(".page-node-type-departments-centers .main-container section").height() > jQuery(".page-node-type-departments-centers aside").height()) { - jQuery(".page-node-type-departments-centers .main-container aside").css({'min-height':(jQuery(".page-node-type-departments-centers .main-container section").height()+'px')}); + if (jQuery(".page-node-type-departments-centers .main-container aside ").css('float') != 'none') { + if(jQuery(".page-node-type-departments-centers .main-container section").height() > jQuery(".page-node-type-departments-centers aside").height()) { + jQuery(".page-node-type-departments-centers .main-container aside").css({'min-height':(jQuery(".page-node-type-departments-centers .main-container section").height()+'px')}); + } } - if(jQuery(".page-node-type-academic-programs .main-container section").height() > jQuery(".page-node-type-academic-programs aside").height()) { - jQuery(".page-node-type-academic-programs .main-container aside").css({'min-height':(jQuery(".page-node-type-academic-programs .main-container section").height()+'px')}); + if (jQuery(".page-node-type-academic-programs .main-container aside").css('float') != 'none') { + if(jQuery(".page-node-type-academic-programs .main-container section").height() > jQuery(".page-node-type-academic-programs aside").height()) { + jQuery(".page-node-type-academic-programs .main-container aside").css({'min-height':(jQuery(".page-node-type-academic-programs .main-container section").height()+'px')}); + } } -- GitLab