Changeset 23232 for branches/2.5/themes

Timestamp:

Jun 15, 2013, 5:45:41 PM (11 years ago)

Author:

mistic100

Message:

Merged revision(s) 23231 from trunk:
feature:2922 Add caseSensitive option to TokenInput (false by default)

File:

• branches/2.5/themes/default/js/plugins/jquery.tokeninput.js (modified) (5 diffs)

branches/2.5/themes/default/js/plugins/jquery.tokeninput.js

@@ -39 +39 @@
     onAdd: null,
     onDelete: null,
-    allowCreation: false
+    allowCreation: false,
+    caseSensitive: false
 };
 
@@ -577 +578 @@
     // Highlight the query part of the search term
     function highlight_term(value, term) {
-        return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + escape_regexp_chars(term) + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<b>$1</b>");
+        var param = "g";
+        if (!settings.caseSensitive) param+= "i";
+        return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + escape_regexp_chars(term) + ")(?![^<>]*>)(?![^&;]+;)", param), "<b>$1</b>");
     }
     
@@ -653 +656 @@
     // than settings.minChars
     function do_search() {
-        var query = input_box.val().toLowerCase();
+        var query = input_box.val();
+        if (!settings.caseSensitive) query = query.toLowerCase();
 
         if(query && query.length) {
@@ -717 +721 @@
 
                   // only populate the dropdown if the results are associated with the active search query
-                  if(input_box.val().toLowerCase() === query) {
+                  var value = input_box.val();
+                  if (!settings.caseSensitive) value = value.toLowerCase();
+                  if(value === query) {
                       populate_dropdown(query, settings.jsonContainer ? results[settings.jsonContainer] : results);
                   }
@@ -727 +733 @@
                 // Do the search through local data
                 var results = $.grep(settings.local_data, function (row) {
-                    return row.name.toLowerCase().indexOf(query.toLowerCase()) > -1;
+                    if (settings.caseSensitive) {
+                        return row.name.indexOf(query) > -1;
+                    }
+                    else {
+                        return row.name.toLowerCase().indexOf(query.toLowerCase()) > -1;
+                    }
                 });