added searchColumns option

vdepizzol · May 10, 2011 · bdff27e · bdff27e
1 parent 4ee6cdb
commit bdff27e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/demo.html b/demo.html
@@ -228,7 +228,7 @@ <h2 id="allowcustomentry">Allowing Custom Entry</h2>
         </script>
     </div>
 
-    <h2 id="parsename">Using local data with parseName function</h2>
+    <h2 id="parsename">Using local data with parseName function and searchColumns setting</h2>
     <div>
         <input type="text" id="demo-input-parsename" name="blah" />
         <input type="button" value="Submit" />
@@ -245,7 +245,8 @@ <h2 id="parsename">Using local data with parseName function</h2>
             {
                 parseName: function(element) {
                     return element.name + ', '+ element.state;
-                }
+                },
+                searchColumns: ['name', 'state']
             });
         });
         </script>

diff --git a/src/jquery.tokeninput.js b/src/jquery.tokeninput.js
@@ -28,6 +28,7 @@ var DEFAULT_SETTINGS = {
     prePopulate: null,
     processPrePopulate: false,
     parseName: null,
+    searchColumns: ['name'],
     animateDropdown: true,
     onResult: null,
     onAdd: null,
@@ -822,11 +823,13 @@ $.TokenList = function (input, url_or_data, settings) {
             } else if(settings.local_data) {
                 // Do the search through local data
                 var results = $.grep(settings.local_data, function (row) {
-                    if(row.name.toLowerCase().removeDiacritics().indexOf(query.toLowerCase().removeDiacritics()) > -1) {
-                        return true;
-                    } else {
-                        return false;
-                    }
+                    var founded = false;
+                    $(settings.searchColumns).each(function(i, item) {
+                        if(row[item].toString().toLowerCase().removeDiacritics().indexOf(query.toString().toLowerCase().removeDiacritics()) > -1) {
+                            founded = true;
+                        }
+                    });
+                    return founded;
                 });
 
                 if($.isFunction(settings.onResult)) {