Coerce set value into string. Fixes #881.

twitter · Jul 9, 2014 · bd8f259 · bd8f259
1 parent 3c0e459
commit bd8f259
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/src/bloodhound/tokenizers.js b/src/bloodhound/tokenizers.js
@@ -16,15 +16,13 @@ var tokenizers = (function(root) {
     }
   };
 
-  function toStr(s) { return (_.isUndefined(s) || s === null) ? '' : s + ''; }
-
   function whitespace(str) {
-    str = toStr(str);
+    str = _.toStr(str);
     return str ? str.split(/\s+/) : [];
   }
 
   function nonword(str) {
-    str = toStr(str);
+    str = _.toStr(str);
     return str ? str.split(/\W+/) : [];
   }
 
@@ -36,7 +34,7 @@ var tokenizers = (function(root) {
         var val, tokens = [];
 
         _.each(args, function(k) {
-          tokens = tokens.concat(tokenizer(toStr(o[k])));
+          tokens = tokens.concat(tokenizer(_.toStr(o[k])));
         });
 
         return tokens;

diff --git a/src/common/utils.js b/src/common/utils.js
@@ -33,6 +33,10 @@ var _ = (function() {
 
     isUndefined: function(obj) { return typeof obj === 'undefined'; },
 
+    toStr: function toStr(s) {
+      return (_.isUndefined(s) || s === null) ? '' : s + '';
+    },
+
     bind: $.proxy,
 
     each: function(collection, cb) {

diff --git a/src/typeahead/typeahead.js b/src/typeahead/typeahead.js
@@ -287,6 +287,9 @@ var Typeahead = (function() {
     },
 
     setVal: function setVal(val) {
+      // expect val to be a string, so be safe, and coerce
+      val = _.toStr(val);
+
       if (this.isActivated) {
         this.input.setInputValue(val);
       }