From 04353719e97715a64c105a45aed36480dc6d02f0 Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 15 Oct 2012 15:52:36 +0200
Subject: [PATCH] [IMP] removed on_close in Dialog

bzr revid: nicolas.vanhoren@openerp.com-20121015135236-r5809kwwbcqo67tj
---
 addons/web/static/src/js/chrome.js                  |  5 +++--
 addons/web/static/src/js/views.js                   |  2 +-
 addons/web_calendar/static/src/js/calendar.js       | 12 ++++++------
 addons/web_kanban/static/src/js/kanban.js           |  8 ++++----
 addons/web_view_editor/static/src/js/view_editor.js |  2 +-
 5 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 078082d07fd..5f05095d880 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -70,7 +70,7 @@ instance.web.Dialog = instance.web.Widget.extend({
             autoOpen: false,
             position: [false, 40],
             buttons: {},
-            beforeClose: function () { self.on_close(); },
+            beforeClose: function () { self.trigger("closing") },
             resizeStop: this.on_resized
         };
         for (var f in this) {
@@ -84,6 +84,7 @@ instance.web.Dialog = instance.web.Widget.extend({
             }
             _.extend(this.dialog_options, options);
         }
+        this.on("closing", this, this._closing);
     },
     get_options: function(options) {
         var self = this,
@@ -153,7 +154,7 @@ instance.web.Dialog = instance.web.Widget.extend({
     close: function() {
         this.$el.dialog('close');
     },
-    on_close: function() {
+    _closing: function() {
         if (this.__tmp_dialog_destroying)
             return;
         if (this.dialog_options.destroy_on_close) {
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index 78cab1c3e33..1554d347552 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -297,7 +297,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
                     dialogClass: executor.klass
                 });
                 if(on_close)
-                    this.dialog.on_close.add(on_close);
+                    this.dialog.on("closing", null, on_close);
             } else {
                 this.dialog_widget.destroy();
             }
diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index e4ecfdab53f..03d22e0dcbd 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -450,6 +450,12 @@ instance.web_calendar.CalendarFormDialog = instance.web.Dialog.extend({
         this.dataset = dataset;
         this.view_id = view_id;
         this.view = view;
+        this.on("closing", this, function() {
+            if (this.view.creating_event_id) {
+                scheduler.deleteEvent(this.view.creating_event_id);
+                this.view.creating_event_id = null;
+            }
+        });
     },
     start: function() {
         var self = this;
@@ -475,12 +481,6 @@ instance.web_calendar.CalendarFormDialog = instance.web.Dialog.extend({
         this.view.reload_event(id);
         this.close();
     },
-    on_close: function() {
-        if (this.view.creating_event_id) {
-            scheduler.deleteEvent(this.view.creating_event_id);
-            this.view.creating_event_id = null;
-        }
-    }
 });
 
 instance.web_calendar.Sidebar = instance.web.Widget.extend({
diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js
index d884fa6e6a2..decc20b1a03 100644
--- a/addons/web_kanban/static/src/js/kanban.js
+++ b/addons/web_kanban/static/src/js/kanban.js
@@ -194,10 +194,10 @@ instance.web_kanban.KanbanView = instance.web.View.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on("on_button_cancel", self, am.dialog.on_close);
+        form.on("on_button_cancel", am.dialog, am.dialog.close);
         form.on('record_created', self, function(r) {
             (new instance.web.DataSet(self, self.group_by_field.relation)).name_get([r]).then(function(new_record) {
-                am.dialog.on_close();
+                am.dialog.close();
                 var domain = self.dataset.domain.slice(0);
                 domain.push([self.group_by, '=', new_record[0][0]]);
                 var dataset = new instance.web.DataSetSearch(self, self.dataset.model, self.dataset.get_context(), domain);
@@ -672,9 +672,9 @@ instance.web_kanban.KanbanGroup = instance.web.Widget.extend({
         });
         var am = instance.webclient.action_manager;
         var form = am.dialog_widget.views.form.controller;
-        form.on("on_button_cancel", self, am.dialog.on_close);
+        form.on("on_button_cancel", am.dialog, am.dialog.close);
         form.on('record_saved', self, function() {
-            am.dialog.on_close();
+            am.dialog.close();
             self.view.do_reload();
         });
     },
diff --git a/addons/web_view_editor/static/src/js/view_editor.js b/addons/web_view_editor/static/src/js/view_editor.js
index 63dc864c916..2732954097d 100644
--- a/addons/web_view_editor/static/src/js/view_editor.js
+++ b/addons/web_view_editor/static/src/js/view_editor.js
@@ -67,7 +67,7 @@ instance.web_view_editor.ViewEditor =   instance.web.Widget.extend({
                 {text: _t("Close"), click: function() { self.view_edit_dialog.close(); window.location.reload(); }}
             ]
         }).open();
-        this.view_edit_dialog.on_close.add_last(function(){window.location.reload();});
+        this.view_edit_dialog.on("closing", this, function(){window.location.reload();});
         this.main_view_id = this.parent.fields_view.view_id;
         this.action_manager = new instance.web.ActionManager(this);
         this.action_manager.appendTo(this.view_edit_dialog.$el);