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

[FIX] web: missing backport of rev df3c6b7502 

[FIX] web: do not try to close a destroyed dialog. trigger "closing" signal on close by top-right "X" button
This commit is contained in:
Simon Lejeune 2014-09-09 11:52:44 +02:00
parent 1e374b4ad7
commit a210420582
1 changed files with 6 additions and 2 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

@ -194,6 +194,8 @@ instance.web.Dialog = instance.web.Widget.extend({
if (options.height === 'auto' && options.max_height) {
this.$el.css({ 'max-height': options.max_height, 'overflow-y': 'auto' });
}
var self = this;
this.$el.on('dialogclose', function() { self.close(); });
this.dialog_inited = true;
var res = this.start();
return res;
@ -202,9 +204,11 @@ instance.web.Dialog = instance.web.Widget.extend({
Closes the popup, if destroy_on_close was passed to the constructor, it is also destroyed.
*/
close: function(reason) {
if (this.dialog_inited && this.$el.is(":data(dialog)")) {
if (this.dialog_inited) {
this.trigger("closing", reason);
this.$el.dialog('close');
if (this.$el.is(":data(dialog)")) { // may have been destroyed by closing signal
this.$el.dialog('close');
}
}
},
_closing: function() {