MDL-72481 theme_boost: Find the tab if it is inside the more dropdown

sharidas · rezaies · rezaies · commit 044439fc84f9 · 2022-03-15T12:48:22.000+11:00
keep the selector limited to tablists to prevent infinite redirects

Co-authored-by: Shamim Rezaie &lt;shamim@moodle.com&gt;
diff --git a/theme/boost/amd/build/loader.min.js b/theme/boost/amd/build/loader.min.js
diff --git a/theme/boost/amd/build/loader.min.js.map b/theme/boost/amd/build/loader.min.js.map
diff --git a/theme/boost/amd/src/loader.js b/theme/boost/amd/src/loader.js
@@ -42,7 +42,7 @@ const rememberTabs = () => {
     });
     const hash = window.location.hash;
     if (hash) {
-        const tab = document.querySelector('.nav-link[href="' + hash + '"]');
+        const tab = document.querySelector('[role="tablist"] [href="' + hash + '"]');
         if (tab) {
             tab.click();
         }
diff --git a/theme/boost/scss/moodle/moremenu.scss b/theme/boost/scss/moodle/moremenu.scss
@@ -86,7 +86,7 @@
             }
         }
     }
-    /* TODO: MDL-72481: Update this style to also apply to aria-selected. */
+
     .dropdown-item[aria-current="true"],
     .dropdown-item.active {
         background-color: transparent;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
@@ -21469,8 +21469,7 @@ div.editor_atto_toolbar button .icon {
 
 .moremenu {
   opacity: 0;
-  height: 60px;
-  /* TODO: MDL-72481: Update this style to also apply to aria-selected. */ }
+  height: 60px; }
   .moremenu.observed {
     opacity: 1; }
   .moremenu .nav-link {
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
@@ -21415,8 +21415,7 @@ div.editor_atto_toolbar button .icon {
 
 .moremenu {
   opacity: 0;
-  height: 50px;
-  /* TODO: MDL-72481: Update this style to also apply to aria-selected. */ }
+  height: 50px; }
   .moremenu.observed {
     opacity: 1; }
   .moremenu .nav-link {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ const rememberTabs = () => {`
`42`	`42`	`});`
`43`	`43`	`const hash = window.location.hash;`
`44`	`44`	`if (hash) {`
`45`		`- const tab = document.querySelector('.nav-link[href="' + hash + '"]');`
	`45`	`+ const tab = document.querySelector('[role="tablist"] [href="' + hash + '"]');`
`46`	`46`	`if (tab) {`
`47`	`47`	`tab.click();`
`48`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
`89`		`- /* TODO: MDL-72481: Update this style to also apply to aria-selected. */`
	`89`	`+`
`90`	`90`	`.dropdown-item[aria-current="true"],`
`91`	`91`	`.dropdown-item.active {`
`92`	`92`	`background-color: transparent;`