Merge pull request loopj#129 from vicox/master

Don't add tokens if limit has been reached.
arrbee · Jul 8, 2011 · e3501ad · e3501ad
2 parents 3c115b1 + 32f2f35
commit e3501ad
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/jquery.tokeninput.js b/src/jquery.tokeninput.js
@@ -470,8 +470,10 @@ $.TokenList = function (input, url_or_data, settings) {
         }
 
         // Insert the new tokens
-        insert_token(item);
-        checkTokenLimit();
+        if(settings.tokenLimit == null || token_count < settings.tokenLimit) {
+            insert_token(item);
+            checkTokenLimit();
+        }
 
         // Clear input box
         input_box.val("");