MDL-82024 format_topics: toggle un/highlight section icon correctly.

paulholden · Jun 24, 2024 · 160617d · 160617d
1 parent cd781ab
commit 160617d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/course/format/topics/amd/build/section.min.js b/course/format/topics/amd/build/section.min.js
diff --git a/course/format/topics/amd/build/section.min.js.map b/course/format/topics/amd/build/section.min.js.map
diff --git a/course/format/topics/amd/src/section.js b/course/format/topics/amd/src/section.js
@@ -98,6 +98,8 @@ class HighlightSection extends BaseComponent {
             if (newIcon) {
                 const pixHtml = await Templates.renderPix(newIcon, 'core');
                 Templates.replaceNode(icon, pixHtml, '');
+                affectedAction.dataset.swapicon = affectedAction.dataset.icon;
+                affectedAction.dataset.icon = newIcon;
             }
         }
     }

diff --git a/course/format/topics/classes/output/courseformat/content/section/controlmenu.php b/course/format/topics/classes/output/courseformat/content/section/controlmenu.php
@@ -117,38 +117,43 @@ protected function get_highlight_control(): array {
         }
 
         $highlightoff = get_string('highlightoff');
+        $highlightofficon = 'i/marked';
+
         $highlighton = get_string('highlight');
+        $highlightonicon = 'i/marker';
 
         if ($course->marker == $section->section) {  // Show the "light globe" on/off.
             $url->param('marker', 0);
             $result = [
                 'url' => $url,
-                'icon' => 'i/marked',
+                'icon' => $highlightofficon,
                 'name' => $highlightoff,
                 'pixattr' => ['class' => ''],
                 'attr' => [
                     'class' => 'editing_highlight',
                     'data-action' => 'sectionUnhighlight',
                     'data-sectionreturn' => $sectionreturn,
                     'data-id' => $section->id,
+                    'data-icon' => $highlightofficon,
                     'data-swapname' => $highlighton,
-                    'data-swapicon' => 'i/marker',
+                    'data-swapicon' => $highlightonicon,
                 ],
             ];
         } else {
             $url->param('marker', $section->section);
             $result = [
                 'url' => $url,
-                'icon' => 'i/marker',
+                'icon' => $highlightonicon,
                 'name' => $highlighton,
                 'pixattr' => ['class' => ''],
                 'attr' => [
                     'class' => 'editing_highlight',
                     'data-action' => 'sectionHighlight',
                     'data-sectionreturn' => $sectionreturn,
                     'data-id' => $section->id,
+                    'data-icon' => $highlightonicon,
                     'data-swapname' => $highlightoff,
-                    'data-swapicon' => 'i/marked',
+                    'data-swapicon' => $highlightofficon,
                 ],
             ];
         }