From b678eb01ee300d35a0854cf92e4bbad565bfe301 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 29 Apr 2021 18:13:18 +0530 Subject: [PATCH] fix: Set placeholder value before creating input (cherry picked from commit ca9cafb999cb81718f39a705b2dc760e9b31883c) --- frappe/public/js/frappe/form/controls/color.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js index 9fb827d223..8a60f3e3da 100644 --- a/frappe/public/js/frappe/form/controls/color.js +++ b/frappe/public/js/frappe/form/controls/color.js @@ -2,11 +2,11 @@ import Picker from '../../color_picker/color_picker'; frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({ make_input: function () { + this.df.placeholder = this.df.placeholder || __('Choose a color'); this._super(); 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],