rails_tokeninput 1.6.0 → 1.6.1.rc1

data/lib/rails_tokeninput/version.rb

@@ -1,3 +1,3 @@
 module RailsTokeninput
-  VERSION = "1.6.0"
+  VERSION = "1.6.1.rc1"
 end

data/vendor/assets/javascripts/jquery.tokeninput.js

@@ -32,6 +32,7 @@ var DEFAULT_SETTINGS = {
     animateDropdown: true,
     theme: null,
     zindex: 999,
+    resultsLimit: null,
     resultsFormatter: function(item){ return "<li>" + item[this.propertyToSearch]+ "</li>" },
     tokenFormatter: function(item) { return "<li><p>" + item[this.propertyToSearch] + "</p></li>" },
 
@@ -58,6 +59,7 @@ var DEFAULT_SETTINGS = {
 var DEFAULT_CLASSES = {
     tokenList: "token-input-list",
     token: "token-input-token",
+    tokenReadOnly: "token-input-token-readonly",
     tokenDelete: "token-input-delete-token",
     selectedToken: "token-input-selected-token",
     highlightedToken: "token-input-highlighted-token",
@@ -66,6 +68,7 @@ var DEFAULT_CLASSES = {
     dropdownItem2: "token-input-dropdown-item2",
     selectedDropdownItem: "token-input-selected-dropdown-item",
     inputToken: "token-input-input-token",
+    focused: "token-input-focused",
     disabled: "token-input-disabled"
 };
 
@@ -203,10 +206,12 @@ $.TokenList = function (input, url_or_data, settings) {
             if (settings.tokenLimit === null || settings.tokenLimit !== token_count) {
                 show_dropdown_hint();
             }
+            token_list.addClass(settings.classes.focused);
         })
         .blur(function () {
             hide_dropdown();
             $(this).val("");
+            token_list.removeClass(settings.classes.focused);
         })
         .bind("keyup keydown blur update", resize_input)
         .keydown(function (event) {
@@ -482,26 +487,30 @@ $.TokenList = function (input, url_or_data, settings) {
 
     // Inner function to a token to the list
     function insert_token(item) {
-        var this_token = settings.tokenFormatter(item);
-        this_token = $(this_token)
-          .addClass(settings.classes.token)
-          .insertBefore(input_token);
+        var $this_token = $(settings.tokenFormatter(item));
+        var readonly = item.readonly === true ? true : false;
+
+        if(readonly) $this_token.addClass(settings.classes.tokenReadOnly);
+
+        $this_token.addClass(settings.classes.token).insertBefore(input_token);
 
         // The 'delete token' button
-        $("<span>" + settings.deleteText + "</span>")
-            .addClass(settings.classes.tokenDelete)
-            .appendTo(this_token)
-            .click(function () {
-                if (!settings.disabled) {
-                    delete_token($(this).parent());
-                    hidden_input.change();
-                    return false;
-                }
-            });
+        if(!readonly) {
+          $("<span>" + settings.deleteText + "</span>")
+              .addClass(settings.classes.tokenDelete)
+              .appendTo($this_token)
+              .click(function () {
+                  if (!settings.disabled) {
+                      delete_token($(this).parent());
+                      hidden_input.change();
+                      return false;
+                  }
+              });
+        }
 
         // Store data on the token
         var token_data = item;
-        $.data(this_token.get(0), "tokeninput", item);
+        $.data($this_token.get(0), "tokeninput", item);
 
         // Save this token for duplicate checking
         saved_tokens = saved_tokens.slice(0,selected_token_index).concat([token_data]).concat(saved_tokens.slice(selected_token_index));
@@ -518,7 +527,7 @@ $.TokenList = function (input, url_or_data, settings) {
             hide_dropdown();
         }
 
-        return this_token;
+        return $this_token;
     }
 
     // Add a token to the token list based on user input
@@ -655,7 +664,7 @@ $.TokenList = function (input, url_or_data, settings) {
         var token_values = $.map(saved_tokens, function (el) {
             if(typeof settings.tokenValue == 'function')
               return settings.tokenValue.call(this, el);
-            
+
             return el[settings.tokenValue];
         });
         hidden_input.val(token_values.join(settings.tokenDelimiter));
@@ -694,13 +703,18 @@ $.TokenList = function (input, url_or_data, settings) {
         }
     }
 
+    var regexp_special_chars = new RegExp('[.\\\\+*?\\[\\^\\]$(){}=!<>|:\\-]', 'g');
+    function regexp_escape(term) {
+        return term.replace(regexp_special_chars, '\\$&');
+    }
+
     // Highlight the query part of the search term
     function highlight_term(value, term) {
-        return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<b>$1</b>");
+        return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + regexp_escape(term) + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<b>$1</b>");
     }
 
     function find_value_and_highlight_term(template, value, term) {
-        return template.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + value + ")(?![^<>]*>)(?![^&;]+;)", "g"), highlight_term(value, term));
+        return template.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + regexp_escape(value) + ")(?![^<>]*>)(?![^&;]+;)", "g"), highlight_term(value, term));
     }
 
     // Populate the results dropdown with some results
@@ -719,6 +733,10 @@ $.TokenList = function (input, url_or_data, settings) {
                 })
                 .hide();
 
+            if (settings.resultsLimit && results.length > settings.resultsLimit) {
+                results = results.slice(0, settings.resultsLimit);
+            }
+
             $.each(results, function(index, value) {
                 var this_li = settings.resultsFormatter(value);
 
@@ -871,7 +889,7 @@ $.TokenList = function (input, url_or_data, settings) {
     // Bring browser focus to the specified object.
     // Use of setTimeout is to get around an IE bug.
     // (See, e.g., http://stackoverflow.com/questions/2600186/focus-doesnt-work-in-ie)
-    // 
+    //
     // obj: a jQuery object to focus()
     function focus_with_timeout(obj) {
         setTimeout(function() { obj.focus(); }, 50);
@@ -909,4 +927,4 @@ $.TokenList.Cache = function (options) {
         return data[query];
     };
 };
-}(jQuery));
+}(jQuery));

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rails_tokeninput
 version: !ruby/object:Gem::Version
-  version: 1.6.0
-  prerelease: 
+  version: 1.6.1.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Han
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000Z
+date: 2012-07-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70095240341120 !ruby/object:Gem::Requirement
+  requirement: &70250781782560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70095240341120
+  version_requirements: *70250781782560
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70095240340580 !ruby/object:Gem::Requirement
+  requirement: &70250781782060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70095240340580
+  version_requirements: *70250781782060
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70095240340120 !ruby/object:Gem::Requirement
+  requirement: &70250781781500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '3.1'
   type: :development
   prerelease: false
-  version_requirements: *70095240340120
+  version_requirements: *70250781781500
 description: Gem installation of jquery tokeninput scripts and stylesheets
 email:
 - han@logicallsat.com
@@ -51,14 +51,18 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .DS_Store
 - .gitignore
 - Gemfile
 - README.md
 - Rakefile
+- lib/.DS_Store
 - lib/rails_tokeninput.rb
 - lib/rails_tokeninput/engine.rb
 - lib/rails_tokeninput/version.rb
 - rails_tokeninput.gemspec
+- vendor/.DS_Store
+- vendor/assets/.DS_Store
 - vendor/assets/javascripts/jquery.tokeninput.js
 - vendor/assets/stylesheets/token-input-facebook.css
 - vendor/assets/stylesheets/token-input-mac.css
@@ -79,9 +83,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: rails_tokeninput
 rubygems_version: 1.8.6