[imp] cleaned initialization of mixins

bzr revid: nicolas.vanhoren@openerp.com-20120227093413-8qp1vo90500h9lrw

1 files changed, 6 insertions, 5 deletions

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index da100c19241..e4d426ac4a0 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -261,10 +261,6 @@ openerp.web.Registry = openerp.web.Class.extend( /** @lends openerp.web.Registry
 });
 
 openerp.web.CallbackEnabledMixin = {
-    /**
-     * @constructs openerp.web.CallbackEnabled
-     * @extends openerp.web.Class
-     */
     init: function() {
         // Transform on_* method into openerp.web.callbacks
         for (var name in this) {
@@ -304,7 +300,12 @@ openerp.web.CallbackEnabledMixin = {
     }
 };
 
-openerp.web.CallbackEnabled = openerp.web.Class.extend(_.extend({}, openerp.web.CallbackEnabledMixin));
+openerp.web.CallbackEnabled = openerp.web.Class.extend(_.extend({}, niv.GetterSetterMixin, openerp.web.CallbackEnabledMixin, {
+    init: function() {
+        niv.GetterSetterMixin.init.call(this);
+        openerp.web.CallbackEnabledMixin.init.call(this);
+    }
+}));
 
 openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.web.Connection# */{
     /**