summaryrefslogtreecommitdiff
path: root/addons/base/static/src
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2011-07-26 12:01:36 +0200
committerXavier Morel <xmo@openerp.com>2011-07-26 12:01:36 +0200
commit5070784ba2b04d7ffb8935c9cf01dacfd7f03b26 (patch)
tree135df72c0421f5ab4911cad021a70b57f3b41f21 /addons/base/static/src
parent3b9b028c1ecf0ec66a4d9f230d0078e3c8e82fd6 (diff)
[FIX] correctly call on_close callback when clicking on a dialog's close button
bzr revid: xmo@openerp.com-20110726100136-1i858bxyipiboz0o
Diffstat (limited to 'addons/base/static/src')
-rw-r--r--addons/base/static/src/js/chrome.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js
index 34333abf1be..cc28aea4157 100644
--- a/addons/base/static/src/js/chrome.js
+++ b/addons/base/static/src/js/chrome.js
@@ -532,6 +532,7 @@ openerp.base.Dialog = openerp.base.BaseWidget.extend({
dialog_title: "",
identifier_prefix: 'dialog',
init: function (parent, options) {
+ var self = this;
this._super(parent);
this.options = {
modal: true,
@@ -542,7 +543,10 @@ openerp.base.Dialog = openerp.base.BaseWidget.extend({
min_height: 0,
max_height: '100%',
autoOpen: false,
- buttons: {}
+ buttons: {},
+ close: function () {
+ self.stop();
+ }
};
for (var f in this) {
if (f.substr(0, 10) == 'on_button_') {
@@ -605,11 +609,7 @@ openerp.base.Dialog = openerp.base.BaseWidget.extend({
this.set_options(options);
this.$dialog.dialog(this.options).dialog('open');
},
- close: function(options) {
- this.$dialog.dialog('close');
- },
stop: function () {
- this.close();
this.$dialog.dialog('destroy');
}
});