Merge branch 'master' of github.com:loopj/jquery-tokeninput

Author: loopj

.gitignore

@@ -1,4 +1,5 @@
 _site
 _layouts
 .DS_Store
-gh-pages
+gh-pages
+*.sw*

component.json

@@ -0,0 +1,23 @@
+{
+    "name"         : "jquery-tokeninput",
+    "version"      : "1.6.1",
+    "description"  : "Tokeninput is a jQuery plugin which allows your users to select multiple items from a predefined list, using autocompletion as they type to find each item.",
+    "main"         : [ "./src/jquery.tokeninput.js", "./styles/token-input.css" ],
+    "homepage"     : "http://loopj.com/jquery-tokeninput",
+    "dependencies" : {
+        "jquery" : ">= 1.5.x"
+    },
+    "keywords"     : [
+        "tokeninput",
+        "input",
+        "autocomplete"
+    ],
+    "author" : {
+        "name" : "James Smith",
+        "web"  : "http://loopj.com"
+    },
+    "license": [
+        "http://www.opensource.org/licenses/mit-license.php",
+        "http://www.opensource.org/licenses/gpl-license.php"
+    ]
+}

src/jquery.tokeninput.js

@@ -1,6 +1,6 @@
 /*
  * jQuery Plugin: Tokenizing Autocomplete Text Entry
- * Version 1.6.0
+ * Version 1.6.1
  *
  * Copyright (c) 2009 James Smith (http://loopj.com)
  * Licensed jointly under the GPL and MIT licenses,
@@ -30,6 +30,7 @@ var DEFAULT_SETTINGS = {
     searchingText: "Searching...",
     deleteText: "×",
     animateDropdown: true,
+    placeholder: null,
     theme: null,
     zindex: 999,
     resultsLimit: null,
@@ -54,6 +55,7 @@ var DEFAULT_SETTINGS = {
 
     // Behavioral settings
     allowFreeTagging: false,
+    allowTabOut: false,
 
     // Callbacks
     onResult: null,
@@ -167,7 +169,7 @@ var methods = {
         $(this).data("settings", $.extend({}, $(this).data("settings"), options || {}));
         return this;
     }
-}
+};
 
 // Expose the .tokenInput function to jQuery as a plugin
 $.fn.tokenInput = function (method) {
@@ -251,14 +253,12 @@ $.TokenList = function (input, url_or_data, settings) {
         })
         .blur(function () {
             hide_dropdown();
-            $(this).val("");
-            token_list.removeClass($(input).data("settings").classes.focused);
-
+            
             if ($(input).data("settings").allowFreeTagging) {
               add_freetagging_tokens();
-            } else {
-              $(this).val("");
             }
+            
+            $(this).val("");
             token_list.removeClass($(input).data("settings").classes.focused);
         })
         .bind("keyup keydown blur update", resize_input)
@@ -334,9 +334,16 @@ $.TokenList = function (input, url_or_data, settings) {
                     hidden_input.change();
                   } else {
                     if ($(input).data("settings").allowFreeTagging) {
-                      add_freetagging_tokens();
+                      if($(input).data("settings").allowTabOut && $(this).val() === "") {
+                        return true;
+                      } else {
+                        add_freetagging_tokens();
+                      }
                     } else {
                       $(this).val("");
+                      if($(input).data("settings").allowTabOut) {
+                        return true;
+                      }
                     }
                     event.stopPropagation();
                     event.preventDefault();
@@ -356,6 +363,10 @@ $.TokenList = function (input, url_or_data, settings) {
             }
         });
 
+    // Keep reference for placeholder
+    if (settings.placeholder)
+        input_box.attr("placeholder", settings.placeholder)
+
     // Keep a reference to the original input box
     var hidden_input = $(input)
                            .hide()
@@ -440,6 +451,7 @@ $.TokenList = function (input, url_or_data, settings) {
         $.each(li_data, function (index, value) {
             insert_token(value);
             checkTokenLimit();
+            input_box.attr("placeholder", null)
         });
     }
 
@@ -463,11 +475,11 @@ $.TokenList = function (input, url_or_data, settings) {
                 delete_token($(this));
             }
         });
-    }
+    };
 
     this.add = function(item) {
         add_token(item);
-    }
+    };
 
     this.remove = function(item) {
         token_list.children("li").each(function() {
@@ -485,15 +497,18 @@ $.TokenList = function (input, url_or_data, settings) {
                 }
             }
         });
-    }
+    };
 
     this.getTokens = function() {
         return saved_tokens;
-    }
+    };
 
     this.toggleDisabled = function(disable) {
         toggleDisabled(disable);
-    }
+    };
+
+    // Resize input to maximum width so the placeholder can be seen
+    resize_input();
 
     //
     // Private functions
@@ -531,9 +546,13 @@ $.TokenList = function (input, url_or_data, settings) {
     function resize_input() {
         if(input_val === (input_val = input_box.val())) {return;}
 
+        // Get width left on the current line
+        var width_left = token_list.width() - input_box.offset().left - token_list.offset().left;
         // Enter new content into resizer and resize input accordingly
         input_resizer.html(_escapeHTML(input_val));
-        input_box.width(input_resizer.width() + 30);
+        // Get maximum width, minimum the size of input and maximum the widget's width
+        input_box.width(Math.min(token_list.width(),
+                                 Math.max(width_left, input_resizer.width() + 30)));
     }
 
     function is_printable_character(keycode) {
@@ -615,7 +634,7 @@ $.TokenList = function (input, url_or_data, settings) {
             token_list.children().each(function () {
                 var existing_token = $(this);
                 var existing_data = $.data(existing_token.get(0), "tokeninput");
-                if(existing_data && existing_data.id === item.id) {
+                if(existing_data && existing_data[settings.tokenValue] === item[settings.tokenValue]) {
                     found_existing_token = existing_token;
                     return false;
                 }
@@ -629,9 +648,14 @@ $.TokenList = function (input, url_or_data, settings) {
             }
         }
 
+        // Squeeze input_box so we force no unnecessary line break
+        input_box.width(0);
+
         // Insert the new tokens
         if($(input).data("settings").tokenLimit == null || token_count < $(input).data("settings").tokenLimit) {
             insert_token(item);
+            // Remove the placeholder so it's not seen after you've added a token
+            input_box.attr("placeholder", null)
             checkTokenLimit();
         }
 
@@ -714,6 +738,9 @@ $.TokenList = function (input, url_or_data, settings) {
 
         // Remove this token from the saved list
         saved_tokens = saved_tokens.slice(0,index).concat(saved_tokens.slice(index+1));
+        if (saved_tokens.length == 0) {
+            input_box.attr("placeholder", settings.placeholder)
+        }
         if(index < selected_token_index) selected_token_index--;
 
         // Update the hidden input
@@ -756,7 +783,7 @@ $.TokenList = function (input, url_or_data, settings) {
         dropdown
             .css({
                 position: "absolute",
-                top: $(token_list).offset().top + $(token_list).outerHeight(),
+                top: $(token_list).offset().top + $(token_list).height(),
                 left: $(token_list).offset().left,
                 width: $(token_list).width(),
                 'z-index': $(input).data("settings").zindex
@@ -1013,3 +1040,4 @@ $.TokenList.Cache = function (options) {
     };
 };
 }(jQuery));
+