odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]modal windows: when pressing esc key, modal-backdrop was not removed 

bzr revid: csn@openerp.com-20140414140652-g06gl0mguyhta5px
This commit is contained in:
Cedric Snauwaert 2014-04-14 16:06:52 +02:00
parent 909db628e5
commit 6b020549f8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/web/static/src/js/chrome.js
View File

@ -196,6 +196,7 @@ instance.web.Dialog = instance.web.Widget.extend({
*/
destroy: function (reason) {
this.$buttons.remove();
var self = this;
_.each(this.getChildren(), function(el) {
el.destroy();
});
@ -205,7 +206,12 @@ instance.web.Dialog = instance.web.Widget.extend({
this.__tmp_dialog_destroying = undefined;
}
if (this.dialog_inited && !this.isDestroyed() && this.$el.is(":data(bs.modal)")) {
this.$el.parents('.modal').remove();
//we need this to put the instruction to remove modal from DOM at the end
//of the queue, otherwise it might already have been removed before the modal-backdrop
//is removed when pressing escape key
setTimeout(function () {
self.$el.parents('.modal').remove();
},0);
}
this._super();
}