Merge branch 'MDL-42477-master' of git://github.com/FMCorz/moodle

moodle · Oct 24, 2013 · 680d905 · 680d905
2 parents 012b047 + 3700833
commit 680d905
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/...ry/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js b/...ry/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js
@@ -70,7 +70,8 @@ Y.extend(AUTOLINKER, Y.Base, {
                 for (key in data.entries) {
                     definition = data.entries[key].definition + data.entries[key].attachments;
                     alertpanel = new M.core.alert({title:data.entries[key].concept, message:definition, lightbox:false});
-                    Y.Node.one('#id_yuialertconfirm-' + alertpanel.COUNT).focus();
+                    alertpanel.show();
+                    Y.Node.one('#id_yuialertconfirm-' + alertpanel.get('COUNT')).focus();
                 }
 
                 return true;
@@ -139,6 +140,6 @@ M.filter_glossary.init_filter_autolinking = function(config) {
         "json-parse",
         "event-delegate",
         "overlay",
-        "moodle-core-notification"
+        "moodle-core-notification-alert"
     ]
 });
diff --git a/...sary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js b/...sary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js
diff --git a/...glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js b/...glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js
@@ -70,7 +70,8 @@ Y.extend(AUTOLINKER, Y.Base, {
                 for (key in data.entries) {
                     definition = data.entries[key].definition + data.entries[key].attachments;
                     alertpanel = new M.core.alert({title:data.entries[key].concept, message:definition, lightbox:false});
-                    Y.Node.one('#id_yuialertconfirm-' + alertpanel.COUNT).focus();
+                    alertpanel.show();
+                    Y.Node.one('#id_yuialertconfirm-' + alertpanel.get('COUNT')).focus();
                 }
 
                 return true;
@@ -139,6 +140,6 @@ M.filter_glossary.init_filter_autolinking = function(config) {
         "json-parse",
         "event-delegate",
         "overlay",
-        "moodle-core-notification"
+        "moodle-core-notification-alert"
     ]
 });
diff --git a/filter/glossary/yui/src/autolinker/js/autolinker.js b/filter/glossary/yui/src/autolinker/js/autolinker.js
@@ -68,7 +68,8 @@ Y.extend(AUTOLINKER, Y.Base, {
                 for (key in data.entries) {
                     definition = data.entries[key].definition + data.entries[key].attachments;
                     alertpanel = new M.core.alert({title:data.entries[key].concept, message:definition, lightbox:false});
-                    Y.Node.one('#id_yuialertconfirm-' + alertpanel.COUNT).focus();
+                    alertpanel.show();
+                    Y.Node.one('#id_yuialertconfirm-' + alertpanel.get('COUNT')).focus();
                 }
 
                 return true;

diff --git a/filter/glossary/yui/src/autolinker/meta/autolinker.json b/filter/glossary/yui/src/autolinker/meta/autolinker.json
@@ -7,7 +7,7 @@
         "json-parse",
         "event-delegate",
         "overlay",
-        "moodle-core-notification"
+        "moodle-core-notification-alert"
     ]
   }
 }