MDL-42239 calendar: Fix missing ids issue with mouseover panels

saifulomar · Oct 22, 2013 · 9c7f855 · 9c7f855
1 parent 83a3e35
commit 9c7f855
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/calendar/lib.php b/calendar/lib.php
@@ -398,7 +398,7 @@ function calendar_get_mini($courses, $groups, $users, $calmonth = false, $calyea
             } else if(isset($typesbyday[$day]['startuser'])) {
                 $class .= ' calendar_event_user';
             }
-            $cell = html_writer::link($dayhref, $day, array('aria-controls' => $popupid.'_panel', 'id' => $popupid));
+            $cell = html_writer::link($dayhref, $day, array('id' => $popupid));
         } else {
             $cell = $day;
         }
@@ -441,7 +441,7 @@ function calendar_get_mini($courses, $groups, $users, $calmonth = false, $calyea
             if(! isset($eventsbyday[$day])) {
                 $class .= ' eventnone';
                 $popupid = calendar_get_popup(true, false);
-                $cell = html_writer::link('#', $day, array('aria-controls' => $popupid.'_panel', 'id' => $popupid));
+                $cell = html_writer::link('#', $day, array('id' => $popupid));
             }
             $cell = get_accesshide($today.' ').$cell;
         }

diff --git a/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager-debug.js b/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager-debug.js
@@ -52,6 +52,7 @@ Y.extend(EVENT, Y.Base, {
                 width : Math.floor(constraint.get('offsetWidth')*0.9)+"px"
             });
             panel.render(td);
+            node.setAttribute('aria-controls', panel.get('id'));
             panel.get('boundingBox').addClass('calendar-event-panel');
             panel.get('boundingBox').setAttribute('aria-live', 'off');
             this.on('showevent', panel.show, panel);

diff --git a/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager-min.js b/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager-min.js
diff --git a/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager.js b/calendar/yui/build/moodle-calendar-eventmanager/moodle-calendar-eventmanager.js
@@ -52,6 +52,7 @@ Y.extend(EVENT, Y.Base, {
                 width : Math.floor(constraint.get('offsetWidth')*0.9)+"px"
             });
             panel.render(td);
+            node.setAttribute('aria-controls', panel.get('id'));
             panel.get('boundingBox').addClass('calendar-event-panel');
             panel.get('boundingBox').setAttribute('aria-live', 'off');
             this.on('showevent', panel.show, panel);

diff --git a/calendar/yui/src/eventmanager/js/eventmanager.js b/calendar/yui/src/eventmanager/js/eventmanager.js
@@ -50,6 +50,7 @@ Y.extend(EVENT, Y.Base, {
                 width : Math.floor(constraint.get('offsetWidth')*0.9)+"px"
             });
             panel.render(td);
+            node.setAttribute('aria-controls', panel.get('id'));
             panel.get('boundingBox').addClass('calendar-event-panel');
             panel.get('boundingBox').setAttribute('aria-live', 'off');
             this.on('showevent', panel.show, panel);