From 05694e6d3aff5dc528a54e6e1bcbeed1b27be2af Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Mon, 2 May 2016 15:43:56 +0200 Subject: [PATCH] fix combobox reset behaviour on comboboxes/combogrids with multiselect, if you deselect an item (but not the last), the order of the selected items after resetting is not the same as the original order because of this, the reset button is still enabled this happens, because extjs only adds the missing values instead of overwriting the whole array with this fix, we overwrite the reset function of the comboboxes and only if the values do not match (after a reset) do we clear and set the value again so we only change the behaviour when it is necessary Signed-off-by: Dominik Csapak --- www/manager6/Toolkit.js | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/www/manager6/Toolkit.js b/www/manager6/Toolkit.js index 85f1ed50..30d8f785 100644 --- a/www/manager6/Toolkit.js +++ b/www/manager6/Toolkit.js @@ -137,6 +137,28 @@ Ext.define('PVE.UnderlayPool', { } }); +// if the order of the values are not the same in originalValue and value +// extjs will not overwrite value, but marks the field dirty and thus +// the reset button will be enabled (but clicking it changes nothing) +// so if the arrays are not the same after resetting, we +// clear and set it +Ext.define('PVE.form.ComboBox', { + override: 'Ext.form.field.ComboBox', + + reset: function() { + // copied from combobox + var me = this; + me.callParent(); + me.applyEmptyText(); + + // clear and set when not the same + if (Ext.isArray(me.originalValue) && !Ext.Array.equals(me.getValue(), me.originalValue)) { + me.clearValue(); + me.setValue(me.originalValue); + } + } +}); + // should be fixed with ExtJS 6.0.2, see: // https://www.sencha.com/forum/showthread.php?307244-Bug-with-datefield-in-window-with-scroll Ext.define('PVE.Datepicker', {