From 37008335c0fc2650fedeb1f40be6cfe2a45b10a0 Mon Sep 17 00:00:00 2001 From: Frederic Massart Date: Thu, 24 Oct 2013 09:11:15 +0800 Subject: [PATCH] MDL-42477 filter_glossary: Alert was not showing --- .../moodle-filter_glossary-autolinker-debug.js | 5 +++-- .../moodle-filter_glossary-autolinker-min.js | 2 +- .../moodle-filter_glossary-autolinker.js | 5 +++-- filter/glossary/yui/src/autolinker/js/autolinker.js | 3 ++- filter/glossary/yui/src/autolinker/meta/autolinker.json | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js b/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js index 467c6a3d67189..c6d55c3e986a7 100644 --- a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-debug.js +++ b/filter/glossary/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/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js b/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js index 303c17d7a3d89..7cbf4a4eb2e40 100644 --- a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js +++ b/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker-min.js @@ -1 +1 @@ -YUI.add("moodle-filter_glossary-autolinker",function(e,t){var n="Glossary filter autolinker",r="width",i="height",s="menubar",o="location",u="scrollbars",a="resizable",f="toolbar",l="status",c="directories",h="fullscreen",p="dependent",d;d=function(){d.superclass.constructor.apply(this,arguments)},e.extend(d,e.Base,{overlay:null,initializer:function(){var t=this;e.delegate("click",function(n){n.preventDefault();var r="",i=e.Node.create('
'),s=new e.Overlay({headerContent:r,bodyContent:i}),o,u;t.overlay=s,s.render(e.one(document.body)),o=this.getAttribute("href").replace("showentry.php","showentry_ajax.php"),u={method:"get",context:t,on:{success:function(e,t){this.display_callback(t.responseText)},failure:function(e,t){var n=t.statusText;M.cfg.developerdebug&&(t.statusText+=" ("+o+")"),this.display_callback("bodyContent",n)}}},e.io(o,u)},e.one(document.body),"a.glossary.autolink.concept")},display_callback:function(t){var n,r,i;try{n=e.JSON.parse(t);if(n.success){this.overlay.hide();for(r in n.entries)definition=n.entries[r].definition+n.entries[r].attachments,i=new M.core.alert({title:n.entries[r].concept,message:definition,lightbox:!1}),e.Node.one("#id_yuialertconfirm-"+i.COUNT).focus();return!0}n.error&&new M.core.ajaxException(n)}catch(s){new M.core.exception(s)}return!1}},{NAME:n,ATTRS:{url:{validator:e.Lang.isString,value:M.cfg.wwwroot+"/mod/glossary/showentry.php"},name:{validator:e.Lang.isString,value:"glossaryconcept"},options:{getter:function(){return{width:this.get(r),height:this.get(i),menubar:this.get(s),location:this.get(o),scrollbars:this.get(u),resizable:this.get(a),toolbar:this.get(f),status:this.get(l),directories:this.get(c),fullscreen:this.get(h),dependent:this.get(p)}},readOnly:!0},width:{value:600},height:{value:450},menubar:{value:!1},location:{value:!1},scrollbars:{value:!0},resizable:{value:!0},toolbar:{value:!0},status:{value:!0},directories:{value:!1},fullscreen:{value:!1},dependent:{value:!0}}}),M.filter_glossary=M.filter_glossary||{},M.filter_glossary.init_filter_autolinking=function(e){return new d(e)}},"@VERSION@",{requires:["base","node","io-base","json-parse","event-delegate","overlay","moodle-core-notification"]}); +YUI.add("moodle-filter_glossary-autolinker",function(e,t){var n="Glossary filter autolinker",r="width",i="height",s="menubar",o="location",u="scrollbars",a="resizable",f="toolbar",l="status",c="directories",h="fullscreen",p="dependent",d;d=function(){d.superclass.constructor.apply(this,arguments)},e.extend(d,e.Base,{overlay:null,initializer:function(){var t=this;e.delegate("click",function(n){n.preventDefault();var r="",i=e.Node.create('
'),s=new e.Overlay({headerContent:r,bodyContent:i}),o,u;t.overlay=s,s.render(e.one(document.body)),o=this.getAttribute("href").replace("showentry.php","showentry_ajax.php"),u={method:"get",context:t,on:{success:function(e,t){this.display_callback(t.responseText)},failure:function(e,t){var n=t.statusText;M.cfg.developerdebug&&(t.statusText+=" ("+o+")"),this.display_callback("bodyContent",n)}}},e.io(o,u)},e.one(document.body),"a.glossary.autolink.concept")},display_callback:function(t){var n,r,i;try{n=e.JSON.parse(t);if(n.success){this.overlay.hide();for(r in n.entries)definition=n.entries[r].definition+n.entries[r].attachments,i=new M.core.alert({title:n.entries[r].concept,message:definition,lightbox:!1}),i.show(),e.Node.one("#id_yuialertconfirm-"+i.get("COUNT")).focus();return!0}n.error&&new M.core.ajaxException(n)}catch(s){new M.core.exception(s)}return!1}},{NAME:n,ATTRS:{url:{validator:e.Lang.isString,value:M.cfg.wwwroot+"/mod/glossary/showentry.php"},name:{validator:e.Lang.isString,value:"glossaryconcept"},options:{getter:function(){return{width:this.get(r),height:this.get(i),menubar:this.get(s),location:this.get(o),scrollbars:this.get(u),resizable:this.get(a),toolbar:this.get(f),status:this.get(l),directories:this.get(c),fullscreen:this.get(h),dependent:this.get(p)}},readOnly:!0},width:{value:600},height:{value:450},menubar:{value:!1},location:{value:!1},scrollbars:{value:!0},resizable:{value:!0},toolbar:{value:!0},status:{value:!0},directories:{value:!1},fullscreen:{value:!1},dependent:{value:!0}}}),M.filter_glossary=M.filter_glossary||{},M.filter_glossary.init_filter_autolinking=function(e){return new d(e)}},"@VERSION@",{requires:["base","node","io-base","json-parse","event-delegate","overlay","moodle-core-notification-alert"]}); diff --git a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js b/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js index 467c6a3d67189..c6d55c3e986a7 100644 --- a/filter/glossary/yui/build/moodle-filter_glossary-autolinker/moodle-filter_glossary-autolinker.js +++ b/filter/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 index 8d552cc7d42e8..7cebdac23aeee 100644 --- 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 index f97fb169c8447..ac4042ed37876 100644 --- 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" ] } }