Manually merged 386c3efe729 to resolve conflicts.

Don't add tokens if limit has been reached.
arrbee · Jul 29, 2011 · 39e7d11 · 39e7d11
1 parent d90b91f
commit 39e7d11
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/jquery.tokeninput.js b/src/jquery.tokeninput.js
@@ -647,8 +647,10 @@ $.TokenList = function (input, url_or_data_or_function, settings) {
         }
 
         // Insert the new tokens
-        insert_token(li_data);
-        checkTokenLimit();
+        if(settings.tokenLimit == null || token_count < settings.tokenLimit) {
+            insert_token(li_data);
+            checkTokenLimit();
+        }
 
         // Clear input box
         input_box.val("");