diff options
| author | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-11-11 10:34:05 +0530 |
|---|---|---|
| committer | Yogesh (OpenERP) <ysa@tinyerp.com> | 2011-11-11 10:34:05 +0530 |
| commit | 808253669f9b2fecc0108447dad9800a4038d607 (patch) | |
| tree | c933c9ac0fe719c63c8a1a3c2b82865363bd6a9f /addons/web/static/src/js/core.js | |
| parent | 44af6726ce4c7b2ca170b85417c4bec937534a07 (diff) | |
| parent | 48499f2e0a97f8c84cf3d45755309995a5ff5445 (diff) | |
[MERGE] Merge with trunk upto revision no 1447.
bzr revid: ysa@tinyerp.com-20111111050405-6gpraiqv7iw27n13
Diffstat (limited to 'addons/web/static/src/js/core.js')
| -rw-r--r-- | addons/web/static/src/js/core.js | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index 1929c573e42..0b49e1cc52d 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -887,8 +887,11 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W */ render_element: function() { var rendered = this.render(); - if (rendered || rendered === "") - this.$element = $(rendered); + if (rendered) { + var elem = $(rendered); + this.$element.replaceWith(elem); + this.$element = elem; + } return this; }, /** @@ -900,7 +903,7 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W render: function (additional) { if (this.template) return openerp.web.qweb.render(this.template, _.extend({widget: this}, additional || {})); - return false; + return null; }, /** * Method called after rendering. Mostly used to bind actions, perform asynchronous @@ -912,12 +915,6 @@ openerp.web.Widget = openerp.web.CallbackEnabled.extend(/** @lends openerp.web.W * @returns {jQuery.Deferred} */ start: function() { - /* The default implementation is only useful for retro-compatibility, it is - not necessary to call it using _super() when using Widget for new components. */ - if (!this.$element) { - var tmp = document.getElementById(this.element_id); - this.$element = tmp ? $(tmp) : undefined; - } return $.Deferred().done().promise(); }, /** |