SAK-32188 Overlays for mobile view pop-ups working consistently. (sak…

…aiproject#3917)
aagrandaz · Feb 28, 2017 · 402a529 · 402a529
1 parent 6634c52
commit 402a529
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/reference/library/src/morpheus-master/js/src/sakai.morpheus.more.sites.js b/reference/library/src/morpheus-master/js/src/sakai.morpheus.more.sites.js
@@ -20,11 +20,6 @@ var dhtml_view_sites = function(){
 
       $PBJQ('body').toggleClass('active-more-sites');
 
-      // In mobile mode, hide the tools nav prior to showing sites
-      if ($PBJQ('body').hasClass('toolsNav--displayed')) {
-        toggleToolsNav();
-      }
-
       // Align with the bottom of the main header in desktop mode
       var allSitesButton = $PBJQ('.view-all-sites-btn:visible');
 

diff --git a/reference/library/src/morpheus-master/js/src/sakai.morpheus.responsive.menus.js b/reference/library/src/morpheus-master/js/src/sakai.morpheus.responsive.menus.js
@@ -6,8 +6,14 @@ function toggleToolsNav(event){
   if (event) {
     event.preventDefault();
   }
+
   $PBJQ('body').toggleClass('toolsNav--displayed');
-
+  if ($PBJQ('body').hasClass('toolsNav--displayed')) {
+    /* Add the mask to grey out the top headers - re-use code in more.sites.js */
+    createDHTMLMask(toggleToolsNav);
+  }else{
+    removeDHTMLMask();
+  }
 }
 
 $PBJQ(document).ready(function(){