fixed #98

admin/js/tokeninput.js

@@ -502,6 +502,10 @@ $.TokenList = function (input, url_or_data, settings) {
             item[settings.propertyToSearch] = input_box.val();
         }
 
+        if (!item) {
+            return false;
+        }
+
         // See if the token already exists and select it if we don't want duplicates
         if(token_count > 0 && settings.preventDuplicates) {
             var found_existing_token = null;
@@ -803,7 +807,7 @@ $.TokenList = function (input, url_or_data, settings) {
                 // Attach the success callback
                 ajax_params.success = function(results) {
                   if($.isFunction(settings.onResult)) {
-                      results = settings.onResult.call(hidden_input, results);
+                      results = settings.onResult.call(hidden_input, results, query);
                   }
                   cache.add(cache_key, settings.jsonContainer ? results[settings.jsonContainer] : results);
 
@@ -822,7 +826,7 @@ $.TokenList = function (input, url_or_data, settings) {
                 });
 
                 if($.isFunction(settings.onResult)) {
-                    results = settings.onResult.call(hidden_input, results);
+                    results = settings.onResult.call(hidden_input, results, query);
                 }
                 cache.add(cache_key, results);
                 populate_dropdown(query, results);