vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: Grid row color picker field not working

Browse source
This commit is contained in:
shariquerik 2021-04-29 14:10:33 +05:30
parent 3e78995594
commit 67671c98bb
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
frappe/public/js/frappe/form/controls/color.js
View file

@ -48,7 +48,24 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
$(window).off('hashchange.color-popover');
});
this.$wrapper.find('.control-input').on('click', (e) => {
this.picker.on_change = (color) => {
this.set_value(color);
};
if (!this.selected_color) {
this.selected_color = $(`<div class="selected-color"></div>`);
this.selected_color.insertAfter(this.$input);
}
if (!this.$wrapper.find('.control-input').get(0)) {
this.$wrapper.find('.selected-color')
.css({
"top": "calc(23% + 1px)",
"z-index": "2"
});
}
this.$wrapper.find('.selected-color').parent().on('click', (e) => {
this.$wrapper.popover('toggle');
if (!this.get_color()) {
this.$input.val('');
@ -63,15 +80,6 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
this.$wrapper.popover('hide');
});
});
this.picker.on_change = (color) => {
this.set_value(color);
};
if (!this.selected_color) {
this.selected_color = $(`<div class="selected-color"></div>`);
this.selected_color.insertAfter(this.$input);
}
},
refresh() {
this._super();