[IMP] Support @placeholder in all text based inputs
authorFabien Meghazi <fme@openerp.com>
Wed, 9 May 2012 08:14:21 +0000 (10:14 +0200)
committerFabien Meghazi <fme@openerp.com>
Wed, 9 May 2012 08:14:21 +0000 (10:14 +0200)
bzr revid: fme@openerp.com-20120509081421-ycoovbxzmrmsd72f

addons/web/static/src/js/view_form.js
addons/web/static/src/xml/base.xml

index b128951..09dd690 100644 (file)
@@ -1827,7 +1827,6 @@ instance.web.form.FieldChar = instance.web.form.AbstractField.extend(_.extend({}
     init: function (field_manager, node) {
         this._super(field_manager, node);
         this.password = this.node.attrs.password === 'True' || this.node.attrs.password === '1';
-        this.placeholder = this.node.attrs.placeholder || '';
     },
     initialize_content: function() {
         var self = this;
index 6c540fd..65be05e 100644 (file)
                 t-att-tabindex="widget.node.attrs.tabindex"
                 t-att-autofocus="widget.node.attrs.autofocus"
                 t-attf-class="field_char #{widget.is_field_number ? 'oe-number' : ''}"
-                t-att-placeholder="widget.placeholder"
+                t-att-placeholder="widget.node.attrs.placeholder"
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </div>
     </t>
                     t-att-id="widget.id_for_label"
                     t-att-tabindex="widget.node.attrs.tabindex"
                     t-att-autofocus="widget.node.attrs.autofocus"
+                    t-att-placeholder="widget.node.attrs.placeholder"
                 />
             </td>
             <td width="16">
                     t-att-id="widget.id_for_label"
                     t-att-tabindex="widget.node.attrs.tabindex"
                     t-att-autofocus="widget.node.attrs.autofocus"
+                    t-att-placeholder="widget.node.attrs.placeholder"
                 />
             </td>
             <td width="16">
             class="field_text"
             t-att-tabindex="widget.node.attrs.tabindex"
             t-att-autofocus="widget.node.attrs.autofocus"
+            t-att-placeholder="widget.node.attrs.placeholder"
         ></textarea>
         <img class="oe_field_translate oe_input_icon" t-if="widget.field.translate"
             t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         <input type="text" class="oe_datepicker_container" disabled="disabled" style="display: none;"/>
         <input type="text"
             t-att-name="widget.name"
+            t-att-placeholder="widget.getParent().node.attrs.placeholder"
             t-attf-class="oe_datepicker_master field_#{widget.type_of_date} oe_form_field_#{widget.type_of_date}"
         /><img class="oe_input_icon oe_datepicker_trigger" t-att-src='_s + "/web/static/src/img/ui/field_calendar.png"'
              title="Select date" width="16" height="16" border="0"/>
                     t-att-id="widget.id_for_label"
                     t-att-tabindex="widget.node.attrs.tabindex"
                     t-att-autofocus="widget.node.attrs.autofocus"
+                    t-att-placeholder="widget.node.attrs.placeholder"
                 />
                 <span class="oe-m2o-drop-down-button">
                     <img t-att-src='_s + "/web/static/src/img/down-arrow.png"' /></span>