diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-07-26 16:57:04 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-07-26 16:57:04 +0200 |
| commit | 5fe4ff9c49e741c607ae33279552c6ae492f87ab (patch) | |
| tree | 002e051342611baf9989df4a6e71ace89a5f76b2 /addons/web/static/src/js/corelib.js | |
| parent | 5c0324f3214d95c3a2d34db7d6d145700501c762 (diff) | |
[FIX] move setElement init call from WidgetMixin to Widget
Widget is the one providing both setElement and _make_descriptive...
bzr revid: xmo@openerp.com-20120726145704-uzg7ufntvf24gnyd
Diffstat (limited to 'addons/web/static/src/js/corelib.js')
| -rw-r--r-- | addons/web/static/src/js/corelib.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js index 3fafcab26fb..370fe74e63e 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -514,7 +514,6 @@ instance.web.WidgetMixin = _.extend({},instance.web.CallbackEnabledMixin, { */ init: function(parent) { instance.web.CallbackEnabledMixin.init.call(this); - this.setElement(this._make_descriptive()); this.setParent(parent); }, /** @@ -689,6 +688,8 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, { */ init: function(parent) { instance.web.WidgetMixin.init.call(this,parent); + // FIXME: this should not be + this.setElement(this._make_descriptive()); this.session = instance.connection; }, /** |