clear dataOption on a non-selection change.

rniemeyer · Dec 20, 2013 · b56374e · b56374e
1 parent cca0622
commit b56374e
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 15 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "knockout-jqAutocomplete",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "main": "build/knockout-jqAutocomplete.min.js",
   "ignore": [
     "examples",

diff --git a/build/knockout-jqAutocomplete.js b/build/knockout-jqAutocomplete.js
@@ -1,4 +1,4 @@
-// knockout-jqAutocomplete 0.2.0 | (c) 2013 Ryan Niemeyer |  http://www.opensource.org/licenses/mit-license
+// knockout-jqAutocomplete 0.2.1 | (c) 2013 Ryan Niemeyer |  http://www.opensource.org/licenses/mit-license
 ;(function(factory) {
     if (typeof define === "function" && define.amd) {
         // AMD anonymous module
@@ -42,17 +42,23 @@
 
             //handle updating the actual value
             config.select = function(event, ui) {
-                options.value(ui.item && ui.item.actual);
+                if (ui.item && ui.item.actual) {
+                    options.value(ui.item.actual);
 
-                if (ko.isWriteableObservable(options.dataValue)) {
-                    options.dataValue(ui.item.data);
+                    if (ko.isWriteableObservable(options.dataValue)) {
+                        options.dataValue(ui.item.data);
+                    }
                 }
             };
 
             //user made a change without selecting a value from the list
             config.change = function(event, ui) {
-                if (!ui.item) {
+                if (!ui.item || !ui.item.actual) {
                     options.value(event.target && event.target.value);
+
+                    if (ko.isWriteableObservable(options.dataValue)) {
+                        options.dataValue(null);
+                    }
                 }
             };
 

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.2.0",
+  "version": "0.2.1",
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-uglify": "0.x.x",

diff --git a/spec/knockout-jqAutocomplete.spec.js b/spec/knockout-jqAutocomplete.spec.js
@@ -697,8 +697,7 @@ describe("knockout-jqAutocomplete", function(){
         });
 
         it("should populate the value when not selecting from list", function() {
-            var $listItems,
-                items = ["one", "two", "three"],
+            var items = ["one", "two", "three"],
                 value = ko.observable();
 
             ko.applyBindingsToNode(input, {
@@ -708,11 +707,30 @@ describe("knockout-jqAutocomplete", function(){
                 }
             });
 
+            $input.val("test").blur();
+            $input.trigger("autocompletechange");
+
+            expect(value()).toEqual("test");
+        });
+
+        it("should clear the dataValue when not selecting from list", function() {
+            var items = ["one", "two", "three"],
+                value = ko.observable(),
+                dataValue = ko.observable("test");
+
+            ko.applyBindingsToNode(input, {
+                jqAuto: {
+                    value: value,
+                    dataValue: dataValue,
+                    source: items
+                }
+            });
 
             $input.val("test").blur();
             $input.trigger("autocompletechange");
 
             expect(value()).toEqual("test");
+            expect(dataValue()).toEqual(null);
         });
 
         it("should respect the valueProp option on selection", function() {

diff --git a/src/knockout-jqAutocomplete.js b/src/knockout-jqAutocomplete.js
@@ -41,17 +41,23 @@
 
             //handle updating the actual value
             config.select = function(event, ui) {
-                options.value(ui.item && ui.item.actual);
+                if (ui.item && ui.item.actual) {
+                    options.value(ui.item.actual);
 
-                if (ko.isWriteableObservable(options.dataValue)) {
-                    options.dataValue(ui.item.data);
+                    if (ko.isWriteableObservable(options.dataValue)) {
+                        options.dataValue(ui.item.data);
+                    }
                 }
             };
 
             //user made a change without selecting a value from the list
             config.change = function(event, ui) {
-                if (!ui.item) {
+                if (!ui.item || !ui.item.actual) {
                     options.value(event.target && event.target.value);
+
+                    if (ko.isWriteableObservable(options.dataValue)) {
+                        options.dataValue(null);
+                    }
                 }
             };