ClearableComboBox.js (tine20-2020.08.3) | : | ClearableComboBox.js (tine20-2020.08.4) | ||
---|---|---|---|---|
skipping to change at line 69 | skipping to change at line 69 | |||
t.on("click", this['on' + triggerIndex + 'Click'], this, {preventDef ault: true}); | t.on("click", this['on' + triggerIndex + 'Click'], this, {preventDef ault: true}); | |||
t.addClassOnOver('x-form-trigger-over'); | t.addClassOnOver('x-form-trigger-over'); | |||
t.addClassOnClick('x-form-trigger-click'); | t.addClassOnClick('x-form-trigger-click'); | |||
}, this); | }, this); | |||
this.triggers = ts.elements; | this.triggers = ts.elements; | |||
this.triggers[0].hide(); | this.triggers[0].hide(); | |||
}, | }, | |||
onRender : function(ct, position){ | ||||
Ext.ux.form.ClearableComboBox.superclass.onRender.apply(this, arguments) | ||||
; | ||||
this.wrap.addClass('x-form-field-twin-trigger-wrap'); | ||||
}, | ||||
// clear contents of combobox | // clear contents of combobox | |||
onTrigger1Click: function () { | onTrigger1Click: function () { | |||
if (this.disabled) { | if (this.disabled) { | |||
return; | return; | |||
} | } | |||
this.clearValue(); | this.clearValue(); | |||
}, | }, | |||
// pass to original combobox trigger handler | // pass to original combobox trigger handler | |||
onTrigger2Click: function () { | onTrigger2Click: function () { | |||
skipping to change at line 118 | skipping to change at line 123 | |||
} | } | |||
Ext.ux.form.ClearableComboBox.superclass.onSelect.call(this, combo, reco rd, index); | Ext.ux.form.ClearableComboBox.superclass.onSelect.call(this, combo, reco rd, index); | |||
this.startValue = this.getValue(); | this.startValue = this.getValue(); | |||
}, | }, | |||
/** | /** | |||
* @see Ext.form.ComboBox | * @see Ext.form.ComboBox | |||
*/ | */ | |||
setValue: function (value) { | setValue: function (value) { | |||
Ext.ux.form.ClearableComboBox.superclass.setValue.call(this, value); | Ext.ux.form.ClearableComboBox.superclass.setValue.call(this, value); | |||
if (value && (this.triggers && this.disableClearer !== true)) { | if (value && this.triggers && this.disableClearer !== true && !this.read Only) { | |||
this.triggers[0].show(); | this.triggers[0].show(); | |||
} | } | |||
}, | }, | |||
/** | /** | |||
* @see Ext.form.ComboBox | * @see Ext.form.ComboBox | |||
*/ | */ | |||
assertValue : function(){ | assertValue : function(){ | |||
var val = this.getRawValue(), | var val = this.getRawValue(), | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 7 lines changed or added |