v0.4.2 - ensure that when an observable value becomes empty that the …

…field can be cleared
rniemeyer · Apr 15, 2015 · a0c04f9 · a0c04f9
1 parent a272b43
commit a0c04f9
Show file tree

Hide file tree

Showing 7 changed files with 78 additions and 41 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 node_modules/
 reports/
-bower_components
+bower_components
+.idea
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "knockout-jqAutocomplete",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "main": "build/knockout-jqAutocomplete.min.js",
   "ignore": [
     "examples",
@@ -16,4 +16,4 @@
     "knockout.js": "~3.0.0",
     "jqueryui": "~1.10.3"
   }
-}
+}
diff --git a/build/knockout-jqAutocomplete.js b/build/knockout-jqAutocomplete.js
@@ -1,4 +1,4 @@
-// knockout-jqAutocomplete 0.4.1 | (c) 2015 Ryan Niemeyer |  http://www.opensource.org/licenses/mit-license
+// knockout-jqAutocomplete 0.4.2 | (c) 2015 Ryan Niemeyer |  http://www.opensource.org/licenses/mit-license
 ;(function(factory) {
     if (typeof define === "function" && define.amd) {
         // AMD anonymous module
@@ -98,24 +98,27 @@
                 options = unwrap(valueAccessor()),
                 value = unwrap(options && options.value);
 
+            if (!value && value !== 0) {
+                value = "";
+            }
+
             // find the appropriate value for the input
-            if (value || value === 0) {
-                sources = unwrap(options.source);
-                propNames = self.getPropertyNames(valueAccessor);
-
-                // if there is local data, then try to determine the appropriate value for the input
-                if ($.isArray(sources) && propNames.value) {
-                    value = ko.utils.arrayFirst(sources, function (opt) {
-                            return opt[propNames.value] == value; }
-                    ) || value;
-                }
+            sources = unwrap(options.source);
+            propNames = self.getPropertyNames(valueAccessor);
 
-                if (propNames.input && value && typeof value === "object") {
-                    element.value = value[propNames.input];
-                }
-                else {
-                    element.value = value;
-                }
+            // if there is local data, then try to determine the appropriate value for the input
+            if ($.isArray(sources) && propNames.value) {
+                value = ko.utils.arrayFirst(sources, function (opt) {
+                        return opt[propNames.value] == value;
+                    }
+                ) || value;
+            }
+
+            if (propNames.input && value && typeof value === "object") {
+                element.value = value[propNames.input];
+            }
+            else {
+                element.value = value;
             }
         };
 

diff --git a/build/knockout-jqAutocomplete.min.js b/build/knockout-jqAutocomplete.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "knockout-jqAutocomplete",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-uglify": "0.x.x",
@@ -11,4 +11,4 @@
     "grunt-template-jasmine-istanbul": "0.x.x",
     "grunt-bower-task": "~0.3.4"
   }
-}
+}
diff --git a/spec/knockout-jqAutocomplete.spec.js b/spec/knockout-jqAutocomplete.spec.js
@@ -516,6 +516,36 @@ describe("knockout-jqAutocomplete", function(){
             expect(input.value).toEqual("test");
         });
 
+        it("should clear the input's value, when value is null", function() {
+            instance.update(input, function() {
+                return {
+                    value: ko.observable(null)
+                };
+            });
+
+            expect(input.value).toEqual("");
+        });
+
+        it("should clear the input's value, when value is undefined", function() {
+            instance.update(input, function() {
+                return {
+                    value: ko.observable()
+                };
+            });
+
+            expect(input.value).toEqual("");
+        });
+
+        it("should clear the input's value, when value is an empty string", function() {
+            instance.update(input, function() {
+                return {
+                    value: ko.observable()
+                };
+            });
+
+            expect(input.value).toEqual("");
+        });
+
         it("should set the input's value to labelProp based on valueProp", function () {
             var items = [{ id: "1", name: "One" }],
                 value = ko.observable("1");
@@ -1018,4 +1048,4 @@ describe("knockout-jqAutocomplete", function(){
             expect("item" in handler.calls.argsFor(0)[1]).toBeTruthy();
         });
     });
-});
+});
diff --git a/src/knockout-jqAutocomplete.js b/src/knockout-jqAutocomplete.js
@@ -97,24 +97,27 @@
                 options = unwrap(valueAccessor()),
                 value = unwrap(options && options.value);
 
+            if (!value && value !== 0) {
+                value = "";
+            }
+
             // find the appropriate value for the input
-            if (value || value === 0) {
-                sources = unwrap(options.source);
-                propNames = self.getPropertyNames(valueAccessor);
-
-                // if there is local data, then try to determine the appropriate value for the input
-                if ($.isArray(sources) && propNames.value) {
-                    value = ko.utils.arrayFirst(sources, function (opt) {
-                            return opt[propNames.value] == value; }
-                    ) || value;
-                }
+            sources = unwrap(options.source);
+            propNames = self.getPropertyNames(valueAccessor);
 
-                if (propNames.input && value && typeof value === "object") {
-                    element.value = value[propNames.input];
-                }
-                else {
-                    element.value = value;
-                }
+            // if there is local data, then try to determine the appropriate value for the input
+            if ($.isArray(sources) && propNames.value) {
+                value = ko.utils.arrayFirst(sources, function (opt) {
+                        return opt[propNames.value] == value;
+                    }
+                ) || value;
+            }
+
+            if (propNames.input && value && typeof value === "object") {
+                element.value = value[propNames.input];
+            }
+            else {
+                element.value = value;
             }
         };