Permalink
Browse files

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

  • Loading branch information...
danpoltawski committed Oct 24, 2013
2 parents 012b047 + 3700833 commit 680d9052ad7a2c90e6ba03c8efc2ec51f7b51e78
@@ -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"
]
});

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -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"
]
});
@@ -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;
@@ -7,7 +7,7 @@
"json-parse",
"event-delegate",
"overlay",
"moodle-core-notification"
"moodle-core-notification-alert"
]
}
}

0 comments on commit 680d905

Please sign in to comment.