projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
roojs-core.js
[roojs1]
/
Roo
/
MessageBox.js
diff --git
a/Roo/MessageBox.js
b/Roo/MessageBox.js
index
f702282
..
5f640f0
100644
(file)
--- a/
Roo/MessageBox.js
+++ b/
Roo/MessageBox.js
@@
-11,6
+11,7
@@
/**
* @class Roo.MessageBox
/**
* @class Roo.MessageBox
+ * @static
* Utility class for generating different styles of message boxes. The alias Roo.Msg can also be used.
* Example usage:
*<pre><code>
* Utility class for generating different styles of message boxes. The alias Roo.Msg can also be used.
* Example usage:
*<pre><code>
@@
-33,7
+34,7
@@
Roo.Msg.show({
animEl: 'elId'
});
</code></pre>
animEl: 'elId'
});
</code></pre>
- * @s
ingleton
+ * @s
tatic
*/
Roo.MessageBox = function(){
var dlg, opt, mask, waitTimer;
*/
Roo.MessageBox = function(){
var dlg, opt, mask, waitTimer;
@@
-120,6
+121,7
@@
Roo.MessageBox = function(){
}
}
});
}
}
});
+
dlg.on("hide", handleHide);
mask = dlg.mask;
dlg.addKeyListener(27, handleEsc);
dlg.on("hide", handleHide);
mask = dlg.mask;
dlg.addKeyListener(27, handleEsc);
@@
-306,7
+308,9
@@
Roo.Msg.show({
if(this.isVisible()){
this.hide();
if(this.isVisible()){
this.hide();
- Roo.log("Old Dialog Message:" + msgEl.innerHTML )
+ Roo.log("[Roo.Messagebox] Show called while message displayed:" );
+ Roo.log("Old Dialog Message:" + msgEl.innerHTML );
+ Roo.log("New Dialog Message:" + options.msg )
//this.alert("ERROR", "Multiple dialogs where displayed at the same time");
//throw "Roo.MessageBox ERROR : Multiple dialogs where displayed at the same time";
//this.alert("ERROR", "Multiple dialogs where displayed at the same time");
//throw "Roo.MessageBox ERROR : Multiple dialogs where displayed at the same time";
@@
-361,6
+365,7
@@
Roo.Msg.show({
d.animateTarget = null;
d.show(options.animEl);
}
d.animateTarget = null;
d.show(options.animEl);
}
+ dlg.toFront();
return this;
},
return this;
},