mirror of
https://github.com/moodle/moodle.git
synced 2025-06-02 14:15:11 +02:00
MDL-43259 JavaScript: Stop using deprecated lightbox config setting when instantiating dialogues
This commit is contained in:
parent
cff3b8feed
commit
5947ab3333
2
blocks/community/yui/comments/comments.js
vendored
2
blocks/community/yui/comments/comments.js
vendored
@ -23,7 +23,7 @@ YUI.add('moodle-block_community-comments', function(Y) {
|
||||
.append(Y.one('#commentoverlay-'+commentid+' .commenttitle').get('innerHTML')),
|
||||
bodyContent:Y.one('#commentoverlay-'+commentid).get('innerHTML'),
|
||||
visible: false, //by default it is not displayed
|
||||
lightbox : false,
|
||||
modal: false,
|
||||
zIndex:100,
|
||||
closeButtonTitle: this.get('closeButtonTitle')
|
||||
});
|
||||
|
@ -38,7 +38,7 @@ YUI.add('moodle-block_community-imagegallery', function(Y) {
|
||||
headerContent:Y.one('#imagetitleoverlay').get('innerHTML'),
|
||||
bodyContent:Y.one('#imageoverlay').get('innerHTML'),
|
||||
visible: false, //by default it is not displayed
|
||||
lightbox : false,
|
||||
modal: false,
|
||||
zIndex:100
|
||||
});
|
||||
|
||||
@ -101,7 +101,7 @@ YUI.add('moodle-block_community-imagegallery', function(Y) {
|
||||
+ screennumber + ' / ' + this.imageidnumbers[imageid] + ' </h1></div>' + nextimagelink,
|
||||
bodyContent:Y.one('#imageoverlay').get('innerHTML'),
|
||||
visible: false, //by default it is not displayed
|
||||
lightbox : false,
|
||||
modal: false,
|
||||
zIndex:100,
|
||||
closeButtonTitle: this.get('closeButtonTitle')
|
||||
});
|
||||
|
2
enrol/yui/rolemanager/rolemanager.js
vendored
2
enrol/yui/rolemanager/rolemanager.js
vendored
@ -113,7 +113,7 @@ YUI.add('moodle-enrol-rolemanager', function(Y) {
|
||||
var event = this.on('assignablerolesloaded', function(){
|
||||
event.detach();
|
||||
var s = M.str.role, confirmation = {
|
||||
lightbox : true,
|
||||
modal: true,
|
||||
visible : true,
|
||||
centered : true,
|
||||
title : s.confirmunassigntitle,
|
||||
|
@ -70,7 +70,7 @@ 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, yesLabel: M.util.get_string('ok', 'moodle')});
|
||||
message:definition, modal:false, yesLabel: M.util.get_string('ok', 'moodle')});
|
||||
alertpanel.show();
|
||||
Y.Node.one('#id_yuialertconfirm-' + alertpanel.get('COUNT')).focus();
|
||||
}
|
||||
|
@ -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('<div id="glossaryfilteroverlayprogress"><img src="'+M.cfg.loadingicon+'" class="spinner" /></div>'),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,yesLabel:M.util.get_string("ok","moodle")}),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"]});
|
||||
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('<div id="glossaryfilteroverlayprogress"><img src="'+M.cfg.loadingicon+'" class="spinner" /></div>'),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,modal:!1,yesLabel:M.util.get_string("ok","moodle")}),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"]});
|
||||
|
@ -70,7 +70,7 @@ 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, yesLabel: M.util.get_string('ok', 'moodle')});
|
||||
message:definition, modal:false, yesLabel: M.util.get_string('ok', 'moodle')});
|
||||
alertpanel.show();
|
||||
Y.Node.one('#id_yuialertconfirm-' + alertpanel.get('COUNT')).focus();
|
||||
}
|
||||
|
@ -68,7 +68,7 @@ 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, yesLabel: M.util.get_string('ok', 'moodle')});
|
||||
message:definition, modal:false, yesLabel: M.util.get_string('ok', 'moodle')});
|
||||
alertpanel.show();
|
||||
Y.Node.one('#id_yuialertconfirm-' + alertpanel.get('COUNT')).focus();
|
||||
}
|
||||
|
@ -1,6 +1,14 @@
|
||||
This files describes API changes in core libraries and APIs,
|
||||
information provided here is intended especially for developers.
|
||||
|
||||
=== 2.7 ===
|
||||
|
||||
YUI:
|
||||
* The lightbox attribute for moodle-core-notification-dialogue has been
|
||||
deprecated and replaced by the modal attribute. This was actually
|
||||
changed in Moodle 2.2, but has only been marked as deprecated now. It
|
||||
will be removed in Moodle 2.9.
|
||||
|
||||
=== 2.6 ===
|
||||
|
||||
* Use new methods from core_component class instead of get_core_subsystems(), get_plugin_types(),
|
||||
|
@ -41,7 +41,7 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
|
||||
draggable : true,
|
||||
visible : false, // Hide by default
|
||||
zindex : 100, // Display in front of other items
|
||||
lightbox : true, // This dialogue should be modal
|
||||
modal: true, // This dialogue should be modal.
|
||||
shim : true,
|
||||
closeButtonTitle : this.get('closeButtonTitle')
|
||||
};
|
||||
|
@ -1 +1 @@
|
||||
YUI.add("moodle-core-chooserdialogue",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{panel:null,submitbutton:null,container:null,listenevents:[],bodycontent:null,headercontent:null,instanceconfig:null,setup_chooser_dialogue:function(e,t,n){this.bodycontent=e,this.headercontent=t,this.instanceconfig=n},prepare_chooser:function(){if(this.panel)return;var e,t={bodyContent:this.bodycontent.get("innerHTML"),headerContent:this.headercontent.get("innerHTML"),width:"540px",draggable:!0,visible:!1,zindex:100,lightbox:!0,shim:!0,closeButtonTitle:this.get("closeButtonTitle")};for(e in this.instanceconfig)t[e]=this.instanceconfig[e];this.panel=new M.core.dialogue(t),this.bodycontent.remove(),this.headercontent.remove(),this.panel.hide(),this.panel.render(),this.container=this.panel.get("boundingBox").one(".choosercontainer"),this.options=this.container.all(".option input[type=radio]"),this.panel.get("boundingBox").addClass("chooserdialogue")},display_chooser:function(t){var n,r,i;this.prepare_chooser(),t.preventDefault(),n=this.panel.get("boundingBox"),r=this.container.one(".alloptions"),i=e.one("document").on("orientationchange",function(){this.center_dialogue(r)},this),this.listenevents.push(i),i=e.one("window").on("resize",function(){this.center_dialogue(r)},this),this.listenevents.push(i),i=this.container.on("click",this.check_options,this),this.listenevents.push(i),i=this.container.on("key_up",this.check_options,this),this.listenevents.push(i),i=this.container.on("dblclick",function(e){e.target.ancestor("div.option")&&(this.check_options(),this.submitbutton.setAttribute("disabled","disabled"),this.options.setAttribute("disabled","disabled"),this.cancel_listenevents(),this.container.one("form").submit())},this),this.listenevents.push(i),this.container.one("form").on("submit",function(){this.submitbutton.setAttribute("disabled","disabled"),this.options.setAttribute("disabled","disabled"),this.cancel_listenevents()},this),i=this.container.one(".addcancel").on("click",this.cancel_popup,this),this.listenevents.push(i),i=n.one("button.closebutton").on("click",this.cancel_popup,this),this.listenevents.push(i),i=e.one("document").on("keydown",this.handle_key_press,this),this.listenevents.push(i),this.jumplink=this.container.one(".jump"),this.submitbutton=this.container.one(".submitbutton"),this.submitbutton.set("disabled","true"),this.options.removeAttribute("disabled"),this.panel.show(),this.center_dialogue(r),this.container.one(".option input[type=radio]").focus(),this.check_options()},cancel_listenevents:function(){var e;while(this.listenevents.length)e=this.listenevents.shift(),e.detach()},center_dialogue:function(e){var t=this.panel.get("boundingBox"),n=t.get("winHeight"),r,i;if(this.panel.shouldResizeFullscreen())return;r=this.get("maxheight"),n<=r&&(n<=this.get("minheight")?r=this.get("minheight"):r=n),i=r,r-=110,e.setStyle("maxHeight",r+"px"),dialogueheight=t.getStyle("height"),dialogueheight.match(/.*px$/)?dialogueheight=dialogueheight.replace(/px$/,""):dialogueheight=i,dialogueheight<this.get("baseheight")&&(dialogueheight=this.get("baseheight"),e.setStyle("height",dialogueheight+"px")),this.panel.centerDialogue()},handle_key_press:function(e){e.keyCode===27&&this.cancel_popup(e)},cancel_popup:function(e){e.preventDefault(),this.hide()},hide:function(){this.cancel_listenevents(),this.container.detachAll(),this.panel.hide()},check_options:function(){this.options.each(function(e){var t=e.get("parentNode").get("parentNode");e.get("checked")?(t.addClass("selected"),this.option_selected(e),this.submitbutton.removeAttribute("disabled"),e.focus()):t.removeClass("selected")},this)},option_selected:function(){}},{NAME:"moodle-core-chooserdialogue",ATTRS:{minheight:{value:300},baseheight:{value:400},maxheight:{value:660},closeButtonTitle:{validator:e.Lang.isString,value:"Close"}}}),M.core=M.core||{},M.core.chooserdialogue=n},"@VERSION@",{requires:["base","panel","moodle-core-notification"]});
|
||||
YUI.add("moodle-core-chooserdialogue",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{panel:null,submitbutton:null,container:null,listenevents:[],bodycontent:null,headercontent:null,instanceconfig:null,setup_chooser_dialogue:function(e,t,n){this.bodycontent=e,this.headercontent=t,this.instanceconfig=n},prepare_chooser:function(){if(this.panel)return;var e,t={bodyContent:this.bodycontent.get("innerHTML"),headerContent:this.headercontent.get("innerHTML"),width:"540px",draggable:!0,visible:!1,zindex:100,modal:!0,shim:!0,closeButtonTitle:this.get("closeButtonTitle")};for(e in this.instanceconfig)t[e]=this.instanceconfig[e];this.panel=new M.core.dialogue(t),this.bodycontent.remove(),this.headercontent.remove(),this.panel.hide(),this.panel.render(),this.container=this.panel.get("boundingBox").one(".choosercontainer"),this.options=this.container.all(".option input[type=radio]"),this.panel.get("boundingBox").addClass("chooserdialogue")},display_chooser:function(t){var n,r,i;this.prepare_chooser(),t.preventDefault(),n=this.panel.get("boundingBox"),r=this.container.one(".alloptions"),i=e.one("document").on("orientationchange",function(){this.center_dialogue(r)},this),this.listenevents.push(i),i=e.one("window").on("resize",function(){this.center_dialogue(r)},this),this.listenevents.push(i),i=this.container.on("click",this.check_options,this),this.listenevents.push(i),i=this.container.on("key_up",this.check_options,this),this.listenevents.push(i),i=this.container.on("dblclick",function(e){e.target.ancestor("div.option")&&(this.check_options(),this.submitbutton.setAttribute("disabled","disabled"),this.options.setAttribute("disabled","disabled"),this.cancel_listenevents(),this.container.one("form").submit())},this),this.listenevents.push(i),this.container.one("form").on("submit",function(){this.submitbutton.setAttribute("disabled","disabled"),this.options.setAttribute("disabled","disabled"),this.cancel_listenevents()},this),i=this.container.one(".addcancel").on("click",this.cancel_popup,this),this.listenevents.push(i),i=n.one("button.closebutton").on("click",this.cancel_popup,this),this.listenevents.push(i),i=e.one("document").on("keydown",this.handle_key_press,this),this.listenevents.push(i),this.jumplink=this.container.one(".jump"),this.submitbutton=this.container.one(".submitbutton"),this.submitbutton.set("disabled","true"),this.options.removeAttribute("disabled"),this.panel.show(),this.center_dialogue(r),this.container.one(".option input[type=radio]").focus(),this.check_options()},cancel_listenevents:function(){var e;while(this.listenevents.length)e=this.listenevents.shift(),e.detach()},center_dialogue:function(e){var t=this.panel.get("boundingBox"),n=t.get("winHeight"),r,i;if(this.panel.shouldResizeFullscreen())return;r=this.get("maxheight"),n<=r&&(n<=this.get("minheight")?r=this.get("minheight"):r=n),i=r,r-=110,e.setStyle("maxHeight",r+"px"),dialogueheight=t.getStyle("height"),dialogueheight.match(/.*px$/)?dialogueheight=dialogueheight.replace(/px$/,""):dialogueheight=i,dialogueheight<this.get("baseheight")&&(dialogueheight=this.get("baseheight"),e.setStyle("height",dialogueheight+"px")),this.panel.centerDialogue()},handle_key_press:function(e){e.keyCode===27&&this.cancel_popup(e)},cancel_popup:function(e){e.preventDefault(),this.hide()},hide:function(){this.cancel_listenevents(),this.container.detachAll(),this.panel.hide()},check_options:function(){this.options.each(function(e){var t=e.get("parentNode").get("parentNode");e.get("checked")?(t.addClass("selected"),this.option_selected(e),this.submitbutton.removeAttribute("disabled"),e.focus()):t.removeClass("selected")},this)},option_selected:function(){}},{NAME:"moodle-core-chooserdialogue",ATTRS:{minheight:{value:300},baseheight:{value:400},maxheight:{value:660},closeButtonTitle:{validator:e.Lang.isString,value:"Close"}}}),M.core=M.core||{},M.core.chooserdialogue=n},"@VERSION@",{requires:["base","panel","moodle-core-notification"]});
|
||||
|
@ -41,7 +41,7 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
|
||||
draggable : true,
|
||||
visible : false, // Hide by default
|
||||
zindex : 100, // Display in front of other items
|
||||
lightbox : true, // This dialogue should be modal
|
||||
modal: true, // This dialogue should be modal.
|
||||
shim : true,
|
||||
closeButtonTitle : this.get('closeButtonTitle')
|
||||
};
|
||||
|
@ -28,10 +28,6 @@ function TOOLTIP(config) {
|
||||
config.constrain = true;
|
||||
}
|
||||
|
||||
if (typeof config.lightbox === 'undefined') {
|
||||
config.lightbox = false;
|
||||
}
|
||||
|
||||
TOOLTIP.superclass.constructor.apply(this, [config]);
|
||||
}
|
||||
|
||||
@ -442,6 +438,22 @@ Y.extend(TOOLTIP, M.core.dialogue, {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Y.Base.modifyAttrs(TOOLTIP, {
|
||||
/**
|
||||
* Whether the widget should be modal or not.
|
||||
*
|
||||
* Moodle override: We override this for tooltip to default it to false.
|
||||
*
|
||||
* @attribute Modal
|
||||
* @type Boolean
|
||||
* @default false
|
||||
*/
|
||||
modal: {
|
||||
value: false
|
||||
}
|
||||
});
|
||||
|
||||
M.core = M.core || {};
|
||||
M.core.tooltip = M.core.tooltip = TOOLTIP;
|
||||
|
||||
|
@ -1 +1 @@
|
||||
YUI.add("moodle-core-tooltip",function(e,t){function n(e){e||(e={}),typeof e.draggable=="undefined"&&(e.draggable=!0),typeof e.constrain=="undefined"&&(e.constrain=!0),typeof e.lightbox=="undefined"&&(e.lightbox=!1),n.superclass.constructor.apply(this,[e])}var r={CLOSEBUTTON:".closebutton"},i={PANELTEXT:"tooltiptext"},s={WAITICON:{pix:"i/loading_small",component:"moodle"}},o={};n.NAME="moodle-core-tooltip",n.CSS_PREFIX="moodle-dialogue",n.ATTRS=o,o.initialheadertext={value:""},o.initialbodytext={value:"",setter:function(t){var n,r;return n=e.Node.create("<div />").addClass(i.PANELTEXT),r=e.Node.create("<img />").setAttribute("src",M.util.image_url(s.WAITICON.pix,s.WAITICON.component)).addClass("spinner"),t?(n.set("text",t),r.addClass("iconsmall")):n.addClass("content-lightbox"),n.append(r),n}},o.initialfootertext={value:null,setter:function(t){if(t)return e.Node.create("<div />").set("text",t)}},o.headerhandler={value:"set_header_content"},o.bodyhandler={value:"set_body_content"},o.footerhandler={value:null},o.urlmodifier={value:null},o.textcache={value:null},o.textcachesize={value:10},e.extend(n,M.core.dialogue,{bb:null,listenevents:[],textcache:null,alignpoints:[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.RC],initializer:function(){return this.get("headerhandler")||this.set("headerhandler",this.set_header_content),this.get("bodyhandler")||this.set("bodyhandler",this.set_body_content),this.get("footerhandler")||this.set("footerhandler",function(){}),this.get("urlmodifier")||this.set("urlmodifier",this.modify_url),this.setAttrs({headerContent:this.get("initialheadertext"),bodyContent:this.get("initialbodytext"),footerContent:this.get("initialfootertext")}),this.hide(),this.render(),this.bb=this.get("boundingBox"),this.bb.addClass("moodle-dialogue-tooltip"),right_to_left()&&(this.alignpoints=[e.WidgetPositionAlign.TR,e.WidgetPositionAlign.LC]),this.get("textcache")||this.set("textcache",new e.Cache({max:this.get("textcachesize")})),M.cfg.developerdebug&&this.get("textcache").set("max",0),this},display_panel:function(t){var n,i,s,o,u;t.preventDefault(),t.stopPropagation(),this.cancel_events(),n=t.target.ancestor("a",!0),this.setAttrs({headerContent:this.get("initialheadertext"),bodyContent:this.get("initialbodytext"),footerContent:this.get("initialfootertext")}),this.show(),this.align(n,this.alignpoints),i=this.bb.delegate("click",this.close_panel,r.CLOSEBUTTON,this),this.listenevents.push(i),i=e.one("body").on("key",this.close_panel,"esc",this),this.listenevents.push(i),i=this.bb.on("mousedownoutside",this.close_panel,this),this.listenevents.push(i),s=e.bind(this.get("urlmodifier"),this,n.get("href"))(),u=this.get("textcache").retrieve(s),u?this._set_panel_contents(u.response):(o={method:"get",context:this,sync:!1,on:{complete:function(e,t){this._set_panel_contents(t.responseText,s)}}},e.io(s,o))},_set_panel_contents:function(t,n){var r;try{r=e.JSON.parse(t);if(r.error)return this.close_panel(),new M.core.ajaxException(r)}catch(i){return this.close_panel(),new M.core.exception(i)}e.bind(this.get("headerhandler"),this,r)(),e.bind(this.get("bodyhandler"),this,r)(),e.bind(this.get("footerhandler"),this,r)(),n&&this.get("textcache").add(n,t),this.get("buttons").header[0].focus()},set_header_content:function(e){this.set("headerContent",e.heading)},set_body_content:function(t){var n=e.Node.create("<div />").set("innerHTML",t.text).setAttribute("role","alert").addClass(i.PANELTEXT);this.set("bodyContent",n)},modify_url:function(e){return e.replace(/\.php\?/,"_ajax.php?")},close_panel:function(e){this.hide(),this.cancel_events(),e&&e.preventDefault()},cancel_events:function(){var e;while(this.listenevents.length)e=this.listenevents.shift(),e.detach()}}),M.core=M.core||{},M.core.tooltip=M.core.tooltip=n},"@VERSION@",{requires:["base","node","io-base","moodle-core-notification","json-parse","widget-position","widget-position-align","event-outside","cache-base"]});
|
||||
YUI.add("moodle-core-tooltip",function(e,t){function n(e){e||(e={}),typeof e.draggable=="undefined"&&(e.draggable=!0),typeof e.constrain=="undefined"&&(e.constrain=!0),n.superclass.constructor.apply(this,[e])}var r={CLOSEBUTTON:".closebutton"},i={PANELTEXT:"tooltiptext"},s={WAITICON:{pix:"i/loading_small",component:"moodle"}},o={};n.NAME="moodle-core-tooltip",n.CSS_PREFIX="moodle-dialogue",n.ATTRS=o,o.initialheadertext={value:""},o.initialbodytext={value:"",setter:function(t){var n,r;return n=e.Node.create("<div />").addClass(i.PANELTEXT),r=e.Node.create("<img />").setAttribute("src",M.util.image_url(s.WAITICON.pix,s.WAITICON.component)).addClass("spinner"),t?(n.set("text",t),r.addClass("iconsmall")):n.addClass("content-lightbox"),n.append(r),n}},o.initialfootertext={value:null,setter:function(t){if(t)return e.Node.create("<div />").set("text",t)}},o.headerhandler={value:"set_header_content"},o.bodyhandler={value:"set_body_content"},o.footerhandler={value:null},o.urlmodifier={value:null},o.textcache={value:null},o.textcachesize={value:10},e.extend(n,M.core.dialogue,{bb:null,listenevents:[],textcache:null,alignpoints:[e.WidgetPositionAlign.TL,e.WidgetPositionAlign.RC],initializer:function(){return this.get("headerhandler")||this.set("headerhandler",this.set_header_content),this.get("bodyhandler")||this.set("bodyhandler",this.set_body_content),this.get("footerhandler")||this.set("footerhandler",function(){}),this.get("urlmodifier")||this.set("urlmodifier",this.modify_url),this.setAttrs({headerContent:this.get("initialheadertext"),bodyContent:this.get("initialbodytext"),footerContent:this.get("initialfootertext")}),this.hide(),this.render(),this.bb=this.get("boundingBox"),this.bb.addClass("moodle-dialogue-tooltip"),right_to_left()&&(this.alignpoints=[e.WidgetPositionAlign.TR,e.WidgetPositionAlign.LC]),this.get("textcache")||this.set("textcache",new e.Cache({max:this.get("textcachesize")})),M.cfg.developerdebug&&this.get("textcache").set("max",0),this},display_panel:function(t){var n,i,s,o,u;t.preventDefault(),t.stopPropagation(),this.cancel_events(),n=t.target.ancestor("a",!0),this.setAttrs({headerContent:this.get("initialheadertext"),bodyContent:this.get("initialbodytext"),footerContent:this.get("initialfootertext")}),this.show(),this.align(n,this.alignpoints),i=this.bb.delegate("click",this.close_panel,r.CLOSEBUTTON,this),this.listenevents.push(i),i=e.one("body").on("key",this.close_panel,"esc",this),this.listenevents.push(i),i=this.bb.on("mousedownoutside",this.close_panel,this),this.listenevents.push(i),s=e.bind(this.get("urlmodifier"),this,n.get("href"))(),u=this.get("textcache").retrieve(s),u?this._set_panel_contents(u.response):(o={method:"get",context:this,sync:!1,on:{complete:function(e,t){this._set_panel_contents(t.responseText,s)}}},e.io(s,o))},_set_panel_contents:function(t,n){var r;try{r=e.JSON.parse(t);if(r.error)return this.close_panel(),new M.core.ajaxException(r)}catch(i){return this.close_panel(),new M.core.exception(i)}e.bind(this.get("headerhandler"),this,r)(),e.bind(this.get("bodyhandler"),this,r)(),e.bind(this.get("footerhandler"),this,r)(),n&&this.get("textcache").add(n,t),this.get("buttons").header[0].focus()},set_header_content:function(e){this.set("headerContent",e.heading)},set_body_content:function(t){var n=e.Node.create("<div />").set("innerHTML",t.text).setAttribute("role","alert").addClass(i.PANELTEXT);this.set("bodyContent",n)},modify_url:function(e){return e.replace(/\.php\?/,"_ajax.php?")},close_panel:function(e){this.hide(),this.cancel_events(),e&&e.preventDefault()},cancel_events:function(){var e;while(this.listenevents.length)e=this.listenevents.shift(),e.detach()}}),e.Base.modifyAttrs(n,{modal:{value:!1}}),M.core=M.core||{},M.core.tooltip=M.core.tooltip=n},"@VERSION@",{requires:["base","node","io-base","moodle-core-notification","json-parse","widget-position","widget-position-align","event-outside","cache-base"]});
|
||||
|
@ -28,10 +28,6 @@ function TOOLTIP(config) {
|
||||
config.constrain = true;
|
||||
}
|
||||
|
||||
if (typeof config.lightbox === 'undefined') {
|
||||
config.lightbox = false;
|
||||
}
|
||||
|
||||
TOOLTIP.superclass.constructor.apply(this, [config]);
|
||||
}
|
||||
|
||||
@ -442,6 +438,22 @@ Y.extend(TOOLTIP, M.core.dialogue, {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Y.Base.modifyAttrs(TOOLTIP, {
|
||||
/**
|
||||
* Whether the widget should be modal or not.
|
||||
*
|
||||
* Moodle override: We override this for tooltip to default it to false.
|
||||
*
|
||||
* @attribute Modal
|
||||
* @type Boolean
|
||||
* @default false
|
||||
*/
|
||||
modal: {
|
||||
value: false
|
||||
}
|
||||
});
|
||||
|
||||
M.core = M.core || {};
|
||||
M.core.tooltip = M.core.tooltip = TOOLTIP;
|
||||
|
||||
|
@ -39,7 +39,7 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
|
||||
draggable : true,
|
||||
visible : false, // Hide by default
|
||||
zindex : 100, // Display in front of other items
|
||||
lightbox : true, // This dialogue should be modal
|
||||
modal: true, // This dialogue should be modal.
|
||||
shim : true,
|
||||
closeButtonTitle : this.get('closeButtonTitle')
|
||||
};
|
||||
|
20
lib/yui/src/tooltip/js/tooltip.js
vendored
20
lib/yui/src/tooltip/js/tooltip.js
vendored
@ -26,10 +26,6 @@ function TOOLTIP(config) {
|
||||
config.constrain = true;
|
||||
}
|
||||
|
||||
if (typeof config.lightbox === 'undefined') {
|
||||
config.lightbox = false;
|
||||
}
|
||||
|
||||
TOOLTIP.superclass.constructor.apply(this, [config]);
|
||||
}
|
||||
|
||||
@ -440,5 +436,21 @@ Y.extend(TOOLTIP, M.core.dialogue, {
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Y.Base.modifyAttrs(TOOLTIP, {
|
||||
/**
|
||||
* Whether the widget should be modal or not.
|
||||
*
|
||||
* Moodle override: We override this for tooltip to default it to false.
|
||||
*
|
||||
* @attribute Modal
|
||||
* @type Boolean
|
||||
* @default false
|
||||
*/
|
||||
modal: {
|
||||
value: false
|
||||
}
|
||||
});
|
||||
|
||||
M.core = M.core || {};
|
||||
M.core.tooltip = M.core.tooltip = TOOLTIP;
|
||||
|
@ -1617,7 +1617,6 @@ DROPDOWN = function(config) {
|
||||
config.draggable = false;
|
||||
config.centered = false;
|
||||
config.width = 'auto';
|
||||
config.lightbox = false;
|
||||
config.visible = false;
|
||||
config.footerContent = '';
|
||||
DROPDOWN.superclass.constructor.apply(this, [config]);
|
||||
@ -1700,6 +1699,23 @@ Y.extend(DROPDOWN, M.core.dialogue, {
|
||||
}
|
||||
});
|
||||
|
||||
Y.Base.modifyAttrs(DROPDOWN, {
|
||||
/**
|
||||
* Whether the widget should be modal or not.
|
||||
*
|
||||
* Moodle override: We override this for commentsearch to force it always false.
|
||||
*
|
||||
* @attribute Modal
|
||||
* @type Boolean
|
||||
* @default false
|
||||
*/
|
||||
modal: {
|
||||
getter: function() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
M.assignfeedback_editpdf = M.assignfeedback_editpdf || {};
|
||||
M.assignfeedback_editpdf.dropdown = DROPDOWN;
|
||||
var COLOURPICKER_NAME = "Colourpicker",
|
||||
@ -2063,7 +2079,6 @@ COMMENTSEARCH = function(config) {
|
||||
config.draggable = false;
|
||||
config.centered = true;
|
||||
config.width = '400px';
|
||||
config.lightbox = true;
|
||||
config.visible = false;
|
||||
config.headerContent = M.util.get_string('searchcomments', 'assignfeedback_editpdf');
|
||||
config.footerContent = '';
|
||||
@ -2198,6 +2213,23 @@ Y.extend(COMMENTSEARCH, M.core.dialogue, {
|
||||
}
|
||||
});
|
||||
|
||||
Y.Base.modifyAttrs(COMMENTSEARCH, {
|
||||
/**
|
||||
* Whether the widget should be modal or not.
|
||||
*
|
||||
* Moodle override: We override this for commentsearch to force it always true.
|
||||
*
|
||||
* @attribute Modal
|
||||
* @type Boolean
|
||||
* @default true
|
||||
*/
|
||||
modal: {
|
||||
getter: function() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
M.assignfeedback_editpdf = M.assignfeedback_editpdf || {};
|
||||
M.assignfeedback_editpdf.commentsearch = COMMENTSEARCH;
|
||||
// This file is part of Moodle - http://moodle.org/
|
||||
|
File diff suppressed because one or more lines are too long
@ -1617,7 +1617,6 @@ DROPDOWN = function(config) {
|
||||
config.draggable = false;
|
||||
config.centered = false;
|
||||
config.width = 'auto';
|
||||
config.lightbox = false;
|
||||
config.visible = false;
|
||||
config.footerContent = '';
|
||||
DROPDOWN.superclass.constructor.apply(this, [config]);
|
||||
@ -1700,6 +1699,23 @@ Y.extend(DROPDOWN, M.core.dialogue, {
|
||||
}
|
||||
});
|
||||
|
||||
Y.Base.modifyAttrs(DROPDOWN, {
|
||||
/**
|
||||
* Whether the widget should be modal or not.
|
||||
*
|
||||
* Moodle override: We override this for commentsearch to force it always false.
|
||||
*
|
||||
* @attribute Modal
|
||||
* @type Boolean
|
||||
* @default false
|
||||
*/
|
||||
modal: {
|
||||
getter: function() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
M.assignfeedback_editpdf = M.assignfeedback_editpdf || {};
|
||||
M.assignfeedback_editpdf.dropdown = DROPDOWN;
|
||||
var COLOURPICKER_NAME = "Colourpicker",
|
||||
@ -2063,7 +2079,6 @@ COMMENTSEARCH = function(config) {
|
||||
config.draggable = false;
|
||||
config.centered = true;
|
||||
config.width = '400px';
|
||||
config.lightbox = true;
|
||||
config.visible = false;
|
||||
config.headerContent = M.util.get_string('searchcomments', 'assignfeedback_editpdf');
|
||||
config.footerContent = '';
|
||||
@ -2198,6 +2213,23 @@ Y.extend(COMMENTSEARCH, M.core.dialogue, {
|
||||
}
|
||||
});
|
||||
|
||||
Y.Base.modifyAttrs(COMMENTSEARCH, {
|
||||
/**
|
||||
* Whether the widget should be modal or not.
|
||||
*
|
||||
* Moodle override: We override this for commentsearch to force it always true.
|
||||
*
|
||||
* @attribute Modal
|
||||
* @type Boolean
|
||||
* @default true
|
||||
*/
|
||||
modal: {
|
||||
getter: function() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
M.assignfeedback_editpdf = M.assignfeedback_editpdf || {};
|
||||
M.assignfeedback_editpdf.commentsearch = COMMENTSEARCH;
|
||||
// This file is part of Moodle - http://moodle.org/
|
||||
|
@ -14,7 +14,6 @@ COMMENTSEARCH = function(config) {
|
||||
config.draggable = false;
|
||||
config.centered = true;
|
||||
config.width = '400px';
|
||||
config.lightbox = true;
|
||||
config.visible = false;
|
||||
config.headerContent = M.util.get_string('searchcomments', 'assignfeedback_editpdf');
|
||||
config.footerContent = '';
|
||||
@ -149,5 +148,22 @@ Y.extend(COMMENTSEARCH, M.core.dialogue, {
|
||||
}
|
||||
});
|
||||
|
||||
Y.Base.modifyAttrs(COMMENTSEARCH, {
|
||||
/**
|
||||
* Whether the widget should be modal or not.
|
||||
*
|
||||
* Moodle override: We override this for commentsearch to force it always true.
|
||||
*
|
||||
* @attribute Modal
|
||||
* @type Boolean
|
||||
* @default true
|
||||
*/
|
||||
modal: {
|
||||
getter: function() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
M.assignfeedback_editpdf = M.assignfeedback_editpdf || {};
|
||||
M.assignfeedback_editpdf.commentsearch = COMMENTSEARCH;
|
||||
|
@ -14,7 +14,6 @@ DROPDOWN = function(config) {
|
||||
config.draggable = false;
|
||||
config.centered = false;
|
||||
config.width = 'auto';
|
||||
config.lightbox = false;
|
||||
config.visible = false;
|
||||
config.footerContent = '';
|
||||
DROPDOWN.superclass.constructor.apply(this, [config]);
|
||||
@ -97,5 +96,22 @@ Y.extend(DROPDOWN, M.core.dialogue, {
|
||||
}
|
||||
});
|
||||
|
||||
Y.Base.modifyAttrs(DROPDOWN, {
|
||||
/**
|
||||
* Whether the widget should be modal or not.
|
||||
*
|
||||
* Moodle override: We override this for commentsearch to force it always false.
|
||||
*
|
||||
* @attribute Modal
|
||||
* @type Boolean
|
||||
* @default false
|
||||
*/
|
||||
modal: {
|
||||
getter: function() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
M.assignfeedback_editpdf = M.assignfeedback_editpdf || {};
|
||||
M.assignfeedback_editpdf.dropdown = DROPDOWN;
|
||||
|
Loading…
x
Reference in New Issue
Block a user