Roo/bootstrap/Modal.js
authorEdward <edward@roojs.com>
Mon, 17 Sep 2018 06:36:31 +0000 (14:36 +0800)
committerEdward <edward@roojs.com>
Mon, 17 Sep 2018 06:36:31 +0000 (14:36 +0800)
Roo/bootstrap/Modal.js

index 6935b94..152ab25 100644 (file)
@@ -271,17 +271,14 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
         if(!this.fitwindow && this.maxWidth !== 0){
             
             var w = Math.min(this.maxWidth, Roo.lib.Dom.getViewportWidth(true) - 30);
-//            var h = this.height || Roo.lib.Dom.getViewportHeight(true) - 60;
-//            this.setSize(w,h);
-            this.dialogEl.setWidth(w);
+            var h = this.height || Roo.lib.Dom.getViewportHeight(true) - 60;
+            this.setSize(w,h);
         }
         
     },
 
     setSize : function(w,h)
     {
-        Roo.log('set size!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!');
-        Roo.log([w, h]);
         if (!w && !h) {
             return;
         }
@@ -392,8 +389,7 @@ Roo.extend(Roo.bootstrap.Modal, Roo.bootstrap.Component,  {
     resizeTo: function(w,h)
     {
         // skip.. ?? why??
-        Roo.log('resize to !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1');
-        Roo.log([w, h]);
+
         this.dialogEl.setWidth(w);
         if (this.diff === false) {
             this.diff = this.dialogEl.getHeight() - this.bodyEl.getHeight();