summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/corelib.js
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-07-11 17:25:58 +0200
committerXavier Morel <xmo@openerp.com>2012-07-11 17:25:58 +0200
commit43fb6b3ee39999fd55a045a961372691b8926e58 (patch)
tree263533c3d44eba8356856ceb31980895461f7d4f /addons/web/static/src/js/corelib.js
parentf0ad5fedacc2e994ef8ba45b05113278ac72db95 (diff)
[CHG] require that Widget#attributes be an object if present, not a function
bzr revid: xmo@openerp.com-20120711152558-9jm096g7mowgfvf5
Diffstat (limited to 'addons/web/static/src/js/corelib.js')
-rw-r--r--addons/web/static/src/js/corelib.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js
index 73fa6839607..d71ff91247d 100644
--- a/addons/web/static/src/js/corelib.js
+++ b/addons/web/static/src/js/corelib.js
@@ -711,10 +711,10 @@ instance.web.Widget = instance.web.Class.extend(instance.web.WidgetMixin, {
$el = $(_.str.trim(instance.web.qweb.render(
this.template, {widget: this})));
} else {
- var attrs = _.extend({}, getValue(this, 'attributes') || {});
+ var attrs = _.extend({}, this.attributes || {});
if (this.id) { attrs.id = this.id; }
if (this.className) { attrs['class'] = this.className; }
- $el = $(this.make(this.tagName, attrs))
+ $el = $(this.make(this.tagName, attrs));
}
var $oldel = this.$el;
this.setElement($el);