X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Roo%2Fform%2FComboBox.js;h=b0cea4c60eba34355c9ca4165a652d8c6c4476b4;hb=a094b161eb4c2cbc1877f8ddcf027ceca7444f21;hp=9cbfecf3cb55b715ed65744cdc62d3c6f3f8435e;hpb=10fb93d5e920a0242b74634bdf9b5196ea9c9218;p=roojs1 diff --git a/Roo/form/ComboBox.js b/Roo/form/ComboBox.js index 9cbfecf3cb..b0cea4c60e 100644 --- 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 : ''; - }else{ - return Roo.form.ComboBox.superclass.getValue.call(this); } + return Roo.form.ComboBox.superclass.getValue.call(this); }, /** @@ -728,6 +727,7 @@ Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, { reset : function(){ // overridden so that last data is reset.. this.setValue(this.resetValue); + this.originalValue = this.getValue(); 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); - var sn = Roo.get(this.view.getSelectedNodes()[0]) + var sn = Roo.get(this.view.getSelectedNodes()[0]); sn.scrollIntoView(sn.dom.parentNode, false); + }, + // @overide + cleanLeadingSpace : function(e) + { + return; } /**