Merge lp:~therp-nl/openerp-web/7.0-lp1048643-record_is_undefined into lp:openerp-web

[Holger Brunn (Therp)]

fix lp:1048643

[Antony Lesuisse (OpenERP) (al-openerp)]

The callbackenable mixin will be removed for 7.0 in favor of trigger() on()

review: Needs Fixing

[Xavier (Open ERP) (xmo-deactivatedaccount)]

callbackenabled has been removed, so this fix doesn't apply anymore

Unmerged revisions

3041. By Holger Brunn (Therp) on 2012-09-10

[ADD] function callback.removeCode to remove anonymous functions whose
reference is not available
[FIX] update right row on subsequent calls to buttons which open a dialog

=== modified file 'addons/web/static/src/js/corelib.js'
--- addons/web/static/src/js/corelib.js	2012-09-06 10:38:52 +0000
+++ addons/web/static/src/js/corelib.js	2012-09-10 14:46:23 +0000
@@ -459,6 +459,15 @@
                 return callback;
             };
 
+            //remove callbacks based on either exact reference or same code
+            //convenient when we're busy with anonymous functions
+            callback.removeCode = function(f) {
+                callback.callback_chain = _.difference(callback.callback_chain, _.filter(callback.callback_chain, function(el) {
+                    return el.callback === f || el.callback.toString() == f.toString();
+                }));
+                return callback;
+            };
+
             return callback.add({
                 callback: method,
                 self:obj,

=== modified file 'addons/web/static/src/js/views.js'
--- addons/web/static/src/js/views.js	2012-09-06 15:14:43 +0000
+++ addons/web/static/src/js/views.js	2012-09-10 14:46:23 +0000
@@ -293,6 +293,10 @@
                     this.dialog.on_close.add(on_close);
             } else {
                 this.dialog_widget.destroy();
+                if(on_close) {
+                    this.dialog.on_close.removeCode(on_close);
+                    this.dialog.on_close.add(on_close);
+                }
             }
             this.dialog.dialog_title = action.name;
             this.dialog_widget = widget;