From b1d6e7ad16f1263a0d01ac24b47eb9fa95dd6b48 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 29 Apr 2021 17:41:48 +0530 Subject: [PATCH] fix: Use placeholer attr to set color placeholder instead of value --- frappe/public/js/frappe/form/controls/color.js | 4 ++-- frappe/public/js/frappe/form/grid_row.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js index 25e8598d49..9fb827d223 100644 --- a/frappe/public/js/frappe/form/controls/color.js +++ b/frappe/public/js/frappe/form/controls/color.js @@ -6,6 +6,7 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({ this.make_color_input(); }, make_color_input: function () { + this.df.placeholder = __('Choose a color'); let picker_wrapper = $('
'); this.picker = new Picker({ parent: picker_wrapper[0], @@ -83,8 +84,7 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({ }, set_formatted_input: function(value) { this._super(value); - - this.$input.val(value || __('Choose a color')); + this.$input.val(value); this.selected_color.css({ "background-color": value || 'transparent', }); diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 9a689fabf4..f6da88df57 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -422,7 +422,7 @@ export default class GridRow { field.$input .addClass('input-sm') .attr('data-col-idx', column.column_index) - .attr('placeholder', __(df.label)); + .attr('placeholder', __(df.placeholder || df.label)); // flag list input if (this.columns_list && this.columns_list.slice(-1)[0]===column) { field.$input.attr('data-last-input', 1);