TriggerField.js (tine20-2020.08.3) | : | TriggerField.js (tine20-2020.08.4) | ||
---|---|---|---|---|
skipping to change at line 100 | skipping to change at line 100 | |||
Ext.form.TriggerField.superclass.onResize.call(this, w, h); | Ext.form.TriggerField.superclass.onResize.call(this, w, h); | |||
var tw = this.getTriggerWidth(); | var tw = this.getTriggerWidth(); | |||
if(Ext.isNumber(w)){ | if(Ext.isNumber(w)){ | |||
this.el.setWidth(w - tw); | this.el.setWidth(w - tw); | |||
} | } | |||
this.wrap.setWidth(this.el.getWidth() + tw); | this.wrap.setWidth(this.el.getWidth() + tw); | |||
}, | }, | |||
getTriggerWidth: function(){ | getTriggerWidth: function(){ | |||
var tw = this.trigger.getWidth(); | var tw = this.trigger.getWidth(); | |||
if(!this.hideTrigger && tw === 0){ | if(!(this.hideTrigger || this.readOnly) && tw === 0){ | |||
tw = this.defaultTriggerWidth; | tw = this.defaultTriggerWidth; | |||
} | } | |||
return tw; | return tw; | |||
}, | }, | |||
// private | // private | |||
alignErrorIcon : function(){ | alignErrorIcon : function(){ | |||
if(this.wrap){ | if(this.wrap){ | |||
this.errorIcon.alignTo(this.wrap, 'tl-tr', [2, 0]); | this.errorIcon.alignTo(this.wrap, 'tl-tr', [2, 0]); | |||
} | } | |||
skipping to change at line 229 | skipping to change at line 229 | |||
}, | }, | |||
// private | // private | |||
checkTab : function(me, e){ | checkTab : function(me, e){ | |||
if(e.getKey() == e.TAB){ | if(e.getKey() == e.TAB){ | |||
this.triggerBlur(); | this.triggerBlur(); | |||
} | } | |||
}, | }, | |||
// private | // private | |||
// clicking in list would blur field -> see minicBlur | ||||
onBlur : Ext.emptyFn, | onBlur : Ext.emptyFn, | |||
// private | // private | |||
mimicBlur : function(e){ | mimicBlur : function(e){ | |||
if(!this.isDestroyed && !this.wrap.contains(e.target) && this.validateBl ur(e)){ | if(!this.isDestroyed && !this.wrap.contains(e.target) && this.validateBl ur(e)){ | |||
this.triggerBlur(); | this.triggerBlur(); | |||
} | } | |||
}, | }, | |||
// private | // private | |||
skipping to change at line 352 | skipping to change at line 353 | |||
t.dom.style.display = 'none'; | t.dom.style.display = 'none'; | |||
this['hidden' + triggerIndex] = true; | this['hidden' + triggerIndex] = true; | |||
} | } | |||
this.mon(t, 'click', this['on'+triggerIndex+'Click'], this, {prevent Default:true}); | this.mon(t, 'click', this['on'+triggerIndex+'Click'], this, {prevent Default: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; | |||
}, | }, | |||
onRender : function(ct, position){ | ||||
Ext.form.TwinTriggerField.superclass.onRender.apply(this, arguments); | ||||
this.wrap.addClass('x-form-field-twin-trigger-wrap'); | ||||
}, | ||||
getTriggerWidth: function(){ | getTriggerWidth: function(){ | |||
var tw = 0; | var tw = 0; | |||
Ext.each(this.triggers, function(t, index){ | Ext.each(this.triggers, function(t, index){ | |||
var triggerIndex = 'Trigger' + (index + 1), | var triggerIndex = 'Trigger' + (index + 1), | |||
w = t.getWidth(); | w = t.getWidth(); | |||
if(w === 0 && !this['hidden' + triggerIndex]){ | if(w === 0 && !t['hidden' + triggerIndex]){ | |||
tw += this.defaultTriggerWidth; | tw += this.defaultTriggerWidth; | |||
}else{ | }else{ | |||
tw += w; | tw += w; | |||
} | } | |||
}, this); | }, this); | |||
return tw; | return tw; | |||
}, | }, | |||
// private | // private | |||
onDestroy : function() { | onDestroy : function() { | |||
End of changes. 4 change blocks. | ||||
2 lines changed or deleted | 8 lines changed or added |