Skip to content

Commit

Permalink
v1.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
jitukeji committed Nov 9, 2015
1 parent 1469f3d commit a147bcd
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions script/aui-alert.js
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -61,7 +61,6 @@
setTimeout(function(){
callback(''+ret.value.buttonIndex+'');
},150)

}
});
}
Expand Down

0 comments on commit a147bcd

Please sign in to comment.