projects
/
roojs1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Roo/form/ComboBox.js
[roojs1]
/
Roo
/
form
/
ComboBox.js
diff --git
a/Roo/form/ComboBox.js
b/Roo/form/ComboBox.js
index
911feb5
..
b0cea4c
100644
(file)
--- a/
Roo/form/ComboBox.js
+++ b/
Roo/form/ComboBox.js
@@
-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.resetValue ? this.lastQuery : this.resetValue);
+ 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,8
+1063,13
@@
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);
+ },
+ // @overide
+ cleanLeadingSpace : function(e)
+ {
+ return;
}
/**
}
/**