summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorThibault Delavallée <tde@openerp.com>2012-07-20 13:33:58 +0200
committerThibault Delavallée <tde@openerp.com>2012-07-20 13:33:58 +0200
commit28b3d3eac4edcbf30ca8c8799bca3cd6e249ccd1 (patch)
tree9cf6294cab67298b95c0187663b3f53dc5c800c7 /addons/web/static/src
parent956011bc095c50142ff452aa5a7f9380d0694c73 (diff)
[IMP] text_html widget: cleaned a bit the code.
bzr revid: tde@openerp.com-20120720113358-y5mt98w1ug9ljbvo
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/view_form.js11
1 files changed, 3 insertions, 8 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index c59af5a9307..29ba9060345 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -2320,12 +2320,8 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
this.$cleditor = this.$textarea.cleditor()[0];
// call super now, because cleditor resets the disable attr
this._super.apply(this, arguments);
- if (this.$textarea.attr('disabled') == 'disabled') {
- this.$textarea.cleditor()[0].disable(true);
- }
- else {
- this.$textarea.cleditor()[0].disable(false);
- }
+ // propagate disabled property to cleditor
+ this.$cleditor.disable(this.$textarea.prop('disabled'));
},
set_value: function(value_) {
@@ -2339,8 +2335,7 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
},
get_value: function() {
- var value = this.$cleditor.$area.val();
- return value;
+ return this.$cleditor.$area.val();
},
});