From 756d989a872a41d60b6b902c2397e7157923592d Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Tue, 10 Jan 2012 15:44:20 +0100 Subject: [PATCH] [imp] refactored form view some more to use Mutex bzr revid: nicolas.vanhoren@openerp.com-20120110144420-0bxkguwxgvt2oi9a --- addons/web/static/src/js/view_form.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index cc639a4b027..221d5a33461 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -52,8 +52,8 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# }); this.is_initialized = $.Deferred(); this.mutating_mutex = new $.Mutex(); - this.on_change_lock = $.Deferred().resolve(); - this.reload_lock = $.Deferred().resolve(); + this.on_change_mutex = new $.Mutex(); + this.reload_mutex = new $.Mutex(); }, start: function() { this._super(); @@ -334,8 +334,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# return $.Deferred().reject(); } }; - this.on_change_lock = this.on_change_lock.pipe(act, act); - return this.on_change_lock; + return this.on_change_mutex.exec(act); }, on_processed_onchange: function(response, processed) { try { @@ -534,8 +533,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView# return self.dataset.read_index(_.keys(self.fields_view.fields)).pipe(self.on_record_loaded); } }; - this.reload_lock = this.reload_lock.pipe(act, act); - return this.reload_lock; + return this.reload_mutex.exec(act); }, get_fields_values: function(blacklist) { blacklist = blacklist || [];