mirror of
https://github.com/moodle/moodle.git
synced 2025-08-09 19:06:41 +02:00
MDL-43598 dialogue: fixed bug with render procedure
Conflicts: lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
This commit is contained in:
Sam Hemelryk
parent
0e088aec08
commit
a2fb18da50
8 changed files with 20 additions and 5 deletions
|
|
@ -43,6 +43,7 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
|
|||
zindex : 100, // Display in front of other items
|
||||
lightbox : true, // This dialogue should be modal
|
||||
shim : true,
|
||||
render : false,
|
||||
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,lightbox:!0,shim:!0,render:!1,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"]});
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
|
|||
zindex : 100, // Display in front of other items
|
||||
lightbox : true, // This dialogue should be modal
|
||||
shim : true,
|
||||
render : false,
|
||||
closeButtonTitle : this.get('closeButtonTitle')
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ DIALOGUE = function(c) {
|
|||
}
|
||||
|
||||
config.srcNode = '#'+id;
|
||||
config.render = (typeof config.render !== 'undefined') ? config.render : true;
|
||||
config.width = config.width || '400px';
|
||||
config.center = config.centered && true;
|
||||
config.centered = false;
|
||||
|
|
@ -121,7 +122,10 @@ Y.extend(DIALOGUE, Y.Panel, {
|
|||
initializer : function(config) {
|
||||
var bb;
|
||||
|
||||
if (config.render && !this.get('rendered')) {
|
||||
this.render();
|
||||
}
|
||||
|
||||
this.makeResponsive();
|
||||
this.after('visibleChange', this.visibilityChanged, this);
|
||||
if (config.center) {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -70,6 +70,7 @@ DIALOGUE = function(c) {
|
|||
}
|
||||
|
||||
config.srcNode = '#'+id;
|
||||
config.render = (typeof config.render !== 'undefined') ? config.render : true;
|
||||
config.width = config.width || '400px';
|
||||
config.center = config.centered && true;
|
||||
config.centered = false;
|
||||
|
|
@ -121,7 +122,10 @@ Y.extend(DIALOGUE, Y.Panel, {
|
|||
initializer : function(config) {
|
||||
var bb;
|
||||
|
||||
if (config.render && !this.get('rendered')) {
|
||||
this.render();
|
||||
}
|
||||
|
||||
this.makeResponsive();
|
||||
this.after('visibleChange', this.visibilityChanged, this);
|
||||
if (config.center) {
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, {
|
|||
zindex : 100, // Display in front of other items
|
||||
lightbox : true, // This dialogue should be modal
|
||||
shim : true,
|
||||
render : false,
|
||||
closeButtonTitle : this.get('closeButtonTitle')
|
||||
};
|
||||
|
||||
|
|
|
|||
4
lib/yui/src/notification/js/dialogue.js
vendored
4
lib/yui/src/notification/js/dialogue.js
vendored
|
|
@ -39,6 +39,7 @@ DIALOGUE = function(c) {
|
|||
}
|
||||
|
||||
config.srcNode = '#'+id;
|
||||
config.render = (typeof config.render !== 'undefined') ? config.render : true;
|
||||
config.width = config.width || '400px';
|
||||
config.center = config.centered && true;
|
||||
config.centered = false;
|
||||
|
|
@ -90,7 +91,10 @@ Y.extend(DIALOGUE, Y.Panel, {
|
|||
initializer : function(config) {
|
||||
var bb;
|
||||
|
||||
if (config.render && !this.get('rendered')) {
|
||||
this.render();
|
||||
}
|
||||
|
||||
this.makeResponsive();
|
||||
this.after('visibleChange', this.visibilityChanged, this);
|
||||
if (config.center) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue