projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #5963 - white space strip only on text fields
[roojs1]
/
Roo
/
form
/
ComboBox.js
diff --git
a/Roo/form/ComboBox.js
b/Roo/form/ComboBox.js
index
422a4a9
..
0117cc2
100644
(file)
--- a/
Roo/form/ComboBox.js
+++ b/
Roo/form/ComboBox.js
@@
-111,7
+111,7
@@
Roo.form.ComboBox = function(config){
s.parentNode.removeChild(s); // remove it
}
s.parentNode.removeChild(s); // remove it
}
- }
Roo.log('debug here'); Roo.log(this.store);
+ }
if (this.store) {
this.store = Roo.factory(this.store, Roo.data);
}
if (this.store) {
this.store = Roo.factory(this.store, Roo.data);
}
@@
-643,9
+643,8
@@
Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
getValue : function(){
if(this.valueField){
return typeof this.value != 'undefined' ? this.value : '';
getValue : function(){
if(this.valueField){
return typeof this.value != 'undefined' ? this.value : '';
- }else{
- return Roo.form.ComboBox.superclass.getValue.call(this);
}
}
+ return Roo.form.ComboBox.superclass.getValue.call(this);
},
/**
},
/**
@@
-727,7
+726,8
@@
Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
// private
reset : function(){
// overridden so that last data is reset..
// private
reset : function(){
// overridden so that last data is reset..
- this.setValue(this.originalValue);
+ this.setValue(this.resetValue);
+ this.originalValue = this.getValue();
this.clearInvalid();
this.lastData = false;
if (this.view) {
this.clearInvalid();
this.lastData = false;
if (this.view) {
@@
-1063,9
+1063,9
@@
Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
}
// scroll to?
this.view.select(match);
}
// scroll to?
this.view.select(match);
- var sn = Roo.get(this.view.getSelectedNodes()[0])
+ var sn = Roo.get(this.view.getSelectedNodes()[0])
;
sn.scrollIntoView(sn.dom.parentNode, false);
sn.scrollIntoView(sn.dom.parentNode, false);
- }
+ }
/**
* @cfg {Boolean} grow
/**
* @cfg {Boolean} grow