Merge pull request #184 from Gridium/arrow-object-data

on up/down arrow, set the input only if data.val is a string

Author: jlbooker

src/typeahead/typeahead.js

@@ -416,7 +416,11 @@ var Typeahead = (function() {
 
         // cursor moved to different selectable
         if (data) {
-          this.input.setInputValue(data.val);
+          // set the input only if data.val is a string
+          // don't want to set it to [Object object]
+          if (typeof data.val === 'string') {
+            this.input.setInputValue(data.val);
+          }
         }
 
         // cursor moved off of selectables, back to input

test/typeahead/typeahead_spec.js

@@ -16,6 +16,7 @@ describe('Typeahead', function() {
     this.$input = $fixture.find('input');
 
     testData = { dataset: 'bar', val: 'foo bar', obj: 'fiz' };
+    testObjectData = { dataset: 'bar', val: { id: 1, name: 'foo bar' }, obj: { id: 1, name: 'foo bar' } };
 
 
     this.view = new Typeahead({
@@ -1390,6 +1391,14 @@ describe('Typeahead', function() {
       expect(this.input.setInputValue).toHaveBeenCalledWith(testData.val);
     });
 
+    it('should not update the input value if moved to object selectable', function() {
+      this.menu.getSelectableData.andReturn(testObjectData);
+      this.menu.selectableRelativeToCursor.andReturn($());
+
+      this.view.moveCursor(1);
+      expect(this.input.setInputValue).not.toHaveBeenCalled();
+    });
+
     it('should reset the input value if moved to input', function() {
       this.menu.selectableRelativeToCursor.andReturn($());
       this.view.moveCursor(1);