v1.1.3

jitukeji · jitukeji · commit a147bcd11c66 · 2015-11-09T17:23:22.000+08:00
diff --git a/script/aui-alert.js b/script/aui-alert.js
@@ -27,7 +27,7 @@
             btnColor = opts.btnColor?opts.btnColor:btnColor;
         }
         var _init = function(){
-            if(api.winName=='root'){
+            if(api.winName=='root' && !api.frameName){
                 frmUrl = 'html/aui_alert_frm.html';
             }else{
                 frmUrl = 'aui_alert_frm.html';
@@ -61,7 +61,6 @@
                     setTimeout(function(){
                         callback(''+ret.value.buttonIndex+'');
                     },150)
-                    
                 }
             });
         }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`btnColor = opts.btnColor?opts.btnColor:btnColor;`
`28`	`28`	`}`
`29`	`29`	`var _init = function(){`
`30`		`- if(api.winName=='root'){`
	`30`	`+ if(api.winName=='root' && !api.frameName){`
`31`	`31`	`frmUrl = 'html/aui_alert_frm.html';`
`32`	`32`	`}else{`
`33`	`33`	`frmUrl = 'aui_alert_frm.html';`
`@@ -61,7 +61,6 @@`
`61`	`61`	`setTimeout(function(){`
`62`	`62`	`callback(''+ret.value.buttonIndex+'');`
`63`	`63`	`},150)`
`64`		`-`
`65`	`64`	`}`
`66`	`65`	`});`
`67`	`66`	`}`