roojs-ui.js

[roojs1] / Roo / form / ComboBox.js

diff --git a/Roo/form/ComboBox.js b/Roo/form/ComboBox.js
index 98d26d8..0117cc2 100644 (file)
--- a/Roo/form/ComboBox.js
+++ b/Roo/form/ComboBox.js
@@ -607,9 +607,9 @@ Roo.extend(Roo.form.ComboBox, Roo.form.TriggerField, {
     {
         this.collapse();
         Roo.log(this.store.reader.jsonData);
-        // if (this.store && typeof(this.store.reader.jsonData.errorMsg) != 'undefined') {
-        //     Roo.MessageBox.alert("Error loading",this.store.reader.jsonData.errorMsg);
-        // }
+        if (this.store && typeof(this.store.reader.jsonData.errorMsg) != 'undefined') {
+            Roo.MessageBox.alert("Error loading",this.store.reader.jsonData.errorMsg);
+        }
         
         
     },
@@ -727,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) {
@@ -1062,9 +1063,9 @@ 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);
-    }
+    } 
 
     /** 
     * @cfg {Boolean} grow