From d4297993a45a0339be3dcd68d12ed502f5a2d44d Mon Sep 17 00:00:00 2001 From: hiendinh Date: Thu, 11 Jun 2020 15:25:25 +0700 Subject: [PATCH] MDL-68841 Modal dialogs: Wrong behavior of popup --- .../moodle-core-chooserdialogue-debug.js | 4 +++- .../moodle-core-chooserdialogue-min.js | 2 +- .../moodle-core-chooserdialogue.js | 4 +++- lib/yui/src/chooserdialogue/js/chooserdialogue.js | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js index 4ccb899a838..9d72b87bfaa 100644 --- a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js +++ b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-debug.js @@ -216,7 +216,9 @@ Y.extend(CHOOSERDIALOGUE, Y.Base, { newheight, totalheight; if (this.panel.shouldResizeFullscreen()) { - // No custom sizing required for a fullscreen dialog. + dialogue.setStyle('maxHeight', '100%'); + dialogue.setStyle('height', 'auto'); + this.panel.makeResponsive(); return; } diff --git a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js index 90a6b7549f5..9af91eff2e2 100644 --- a/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js +++ b/lib/yui/build/moodle-core-chooserdialogue/moodle-core-chooserdialogue-min.js @@ -1 +1 @@ -YUI.add("moodle-core-chooserdialogue",function(s,e){var t=function(){t.superclass.constructor.apply(this,arguments)};s.extend(t,s.Base,{panel:null,submitbutton:null,container:null,listenevents:[],bodycontent:null,headercontent:null,instanceconfig:null,hiddenRadioValue:null,setup_chooser_dialogue:function(e,t,i){this.bodycontent=e,this.headercontent=t,this.instanceconfig=i},prepare_chooser:function(){if(!this.panel){s.one(s.config.doc.body).addClass("jschooser");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"),focusOnPreviousTargetAfterHide:!0,render:!1,extraClasses:this._getClassNames()};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.hiddenRadioValue=s.Node.create(''),this.container.one("form").appendChild(this.hiddenRadioValue),this.panel.get("boundingBox").addClass("chooserdialogue")}},display_chooser:function(e){var t,i,n;this.prepare_chooser(),e.preventDefault(),t=this.panel.get("boundingBox"),i=this.container.one(".alloptions"),n=s.one("document").on("orientationchange",function(){this.center_dialogue(i)},this),this.listenevents.push(n),n=s.one("window").on("resize",function(){this.center_dialogue(i)},this),this.listenevents.push(n),n=this.container.on("click",this.check_options,this),this.listenevents.push(n),n=this.container.on("key_up",this.check_options,this),this.listenevents.push(n),n=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(n),this.container.one("form").on("submit",function(){this.submitbutton.setAttribute("disabled","disabled"),this.options.setAttribute("disabled","disabled"),this.cancel_listenevents()},this),n=this.container.one(".addcancel").on("click",this.cancel_popup,this),this.listenevents.push(n),n=t.one("button.closebutton").on("click",this.cancel_popup,this),this.listenevents.push(n),n=s.one("document").on("keydown",this.handle_key_press,this),this.listenevents.push(n),this.submitbutton=this.container.one(".submitbutton"),this.submitbutton.set("disabled","true"),this.options.removeAttribute("disabled"),this.panel.show(e),this.center_dialogue(i),this.container.one(".option input[type=radio]").focus(),this.check_options()},cancel_listenevents:function(){for(;this.listenevents.length;)this.listenevents.shift().detach()},center_dialogue:function(e){var t,i,n,s=this.panel.get("boundingBox"),o=s.get("winHeight");this.panel.shouldResizeFullscreen()||(o<=(t=this.get("maxheight"))&&(t=o<=this.get("minheight")?this.get("minheight"):o),t>this.get("minheight")?this.panel.lockScroll&&!this.panel.lockScroll.isActive()&&this.panel.lockScroll.enableScrollLock(!0):this.panel.lockScroll&&this.panel.lockScroll.isActive()&&this.panel.lockScroll.disableScrollLock(),i=t,t-=156,e.setStyle("maxHeight",t+"px"),(n=(n=s.getStyle("height")).match(/.*px$/)?n.replace(/px$/,""):i)'),this.container.one("form").appendChild(this.hiddenRadioValue),this.panel.get("boundingBox").addClass("chooserdialogue")}},display_chooser:function(e){var t,i,n;this.prepare_chooser(),e.preventDefault(),t=this.panel.get("boundingBox"),i=this.container.one(".alloptions"),n=s.one("document").on("orientationchange",function(){this.center_dialogue(i)},this),this.listenevents.push(n),n=s.one("window").on("resize",function(){this.center_dialogue(i)},this),this.listenevents.push(n),n=this.container.on("click",this.check_options,this),this.listenevents.push(n),n=this.container.on("key_up",this.check_options,this),this.listenevents.push(n),n=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(n),this.container.one("form").on("submit",function(){this.submitbutton.setAttribute("disabled","disabled"),this.options.setAttribute("disabled","disabled"),this.cancel_listenevents()},this),n=this.container.one(".addcancel").on("click",this.cancel_popup,this),this.listenevents.push(n),n=t.one("button.closebutton").on("click",this.cancel_popup,this),this.listenevents.push(n),n=s.one("document").on("keydown",this.handle_key_press,this),this.listenevents.push(n),this.submitbutton=this.container.one(".submitbutton"),this.submitbutton.set("disabled","true"),this.options.removeAttribute("disabled"),this.panel.show(e),this.center_dialogue(i),this.container.one(".option input[type=radio]").focus(),this.check_options()},cancel_listenevents:function(){for(;this.listenevents.length;)this.listenevents.shift().detach()},center_dialogue:function(e){var t,i,n,s=this.panel.get("boundingBox"),o=s.get("winHeight");if(this.panel.shouldResizeFullscreen())return e.setStyle("maxHeight","100%"),e.setStyle("height","auto"),void this.panel.makeResponsive();o<=(t=this.get("maxheight"))&&(t=o<=this.get("minheight")?this.get("minheight"):o),t>this.get("minheight")?this.panel.lockScroll&&!this.panel.lockScroll.isActive()&&this.panel.lockScroll.enableScrollLock(!0):this.panel.lockScroll&&this.panel.lockScroll.isActive()&&this.panel.lockScroll.disableScrollLock(),i=t,t-=156,e.setStyle("maxHeight",t+"px"),(n=(n=s.getStyle("height")).match(/.*px$/)?n.replace(/px$/,""):i)