Merge pull request #182 from steventlamb/topic/remove_family_name_fro…

…m_species_list Topic/remove family name from species list
OpenTreeMap · Jan 2, 2014 · 26b8ddb · 26b8ddb
2 parents 083c748 + 899bacd
commit 26b8ddb
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/static/treemap.js b/static/treemap.js
@@ -485,7 +485,7 @@ tm = {
     formatTreeName: function(item) {
         var cultivar_portion = item.cultivar ? " '" + item.cultivar + "'" : " ";
         return item.cname + " [ " + item.sname + " " + cultivar_portion +
-            " " + item.family + " " + item.other_part + "]";
+            " " + item.other_part + "]";
     },
 
     formatSpeciesName: function(item) {
@@ -496,17 +496,22 @@ tm = {
 
     setupAutoComplete: function(field) {
         return field.autocomplete({
-            source:function(request, response){
-                response( $.map( tm.speciesData, function( item ) {
-                    if (item.cname.toLowerCase().indexOf(request.term.toLowerCase()) != -1 ||
-                        item.sname.toLowerCase().indexOf(request.term.toLowerCase()) != -1)
-                    {
-                                            return {
-                                                    label: tm.formatTreeName(item),
-                                                    value: item.id
-                                            }
+            source: function(request, response) {
+                response($.map(tm.speciesData, function(item) {
+                    var lcTerm = request.term.toLowerCase(),
+                        itemIContainsSearchTerm =
+                            (item.cname.toLowerCase().indexOf(lcTerm) !== -1 ||
+                             item.sname.toLowerCase().indexOf(lcTerm) !== -1);
+
+                    if (itemIContainsSearchTerm) {
+                        return {
+                            label: tm.formatTreeName(item),
+                            value: item.id
+                        };
+                    } else {
+                        return null;
                     }
-                                }));
+                }));
             },
             minLength: 1,
             select: function(event, ui) {