odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Removed useless dependency between fieldtexthtml and fieldtext 

bzr revid: nicolas.vanhoren@openerp.com-20120813152227-29l173q31tcwc9tq
This commit is contained in:
niv-openerp 2012-08-13 17:22:27 +02:00
parent 78f92ec031
commit 8c7b192ab7
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/web/static/src/js/view_form.js
View File

@ -2394,8 +2394,8 @@ instance.web.form.FieldText = instance.web.form.AbstractField.extend(instance.we
* To find more information about CLEditor configutation: go to
* http://premiumsoftware.net/cleditor/docs/GettingStarted.html
*/
instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
template: 'FieldTextHtml',
initialize_content: function() {
this.$textarea = this.$element.find('textarea');
var width = ((this.node.attrs || {}).editor_width || 468);
@ -2411,22 +2411,16 @@ instance.web.form.FieldTextHtml = instance.web.form.FieldText.extend({
"margin:4px; font:12px monospace; cursor:text; color:#1F1F1F"
});
this.$cleditor = this.$textarea.cleditor()[0];
// call super now, because cleditor resets the disable attr
this._super.apply(this, arguments);
// propagate disabled property to cleditor
this.$cleditor.disable(this.$textarea.prop('disabled'));
},
set_value: function(value_) {
this._super.apply(this, arguments);
this._dirty_flag = true;
this.render_value();
},
render_value: function() {
this._super.apply(this, arguments);
this.$textarea.val(this.get('value'));
this.$cleditor.updateFrame();
},
get_value: function() {
this.$cleditor.updateTextArea();
return this.$textarea.val();

5
addons/web/static/src/xml/base.xml
View File

@ -975,6 +975,11 @@
/>
</div>
</t>
<t t-name="FieldTextHtml">
<div class="oe_form_field oe_form_field_text" t-att-style="widget.node.attrs.style">
<textarea/>
</div>
</t>
<t t-name="web.datepicker">
<span>
<t t-set="placeholder" t-value="widget.getParent().node and widget.getParent().node.attrs.placeholder"/>