Fix bug when using data-combobox-case-sensitive="no" and data-combobo…

…x-search-option="beginning"
nico3333fr · Jan 3, 2018 · c4c59e1 · c4c59e1
1 parent 38a0571
commit c4c59e1
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,12 @@
+node_modules/
+
+# OS generated files #
+######################
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+desktop.ini
diff --git a/bower.json b/bower.json
@@ -3,7 +3,7 @@
   "description": "This jQuery plugin will transform and enhance a text input with a datalist into a shiny input with autocomplete, and accessible.",
   "homepage": "https://a11y.nicolas-hoffmann.net/autocomplete-list/",
   "main": "jquery-accessible-autocomplete-list-aria.js",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "keywords": [
     "Accessibility",
     "ARIA",

diff --git a/jquery-accessible-autocomplete-list-aria.js b/jquery-accessible-autocomplete-list-aria.js
@@ -2,7 +2,7 @@ $(document).ready(function() {
 
     /*
      * jQuery accessible and keyboard-enhanced autocomplete list
-     * @version v1.5.4
+     * @version v1.5.6
      * Website: https://a11y.nicolas-hoffmann.net/autocomplet-list/
      * License MIT: https://github.com/nico3333fr/jquery-accessible-autocomplete-list-aria/blob/master/LICENSE
      */
@@ -148,13 +148,17 @@ $(document).ready(function() {
                                     if (
                                         (
                                             $combobox_search_option === 'containing' &&
-                                            ($combobox_case_sensitive === 'yes' && (tablo_suggestions[index_table][i].indexOf(value_to_search) >= 0)) ||
-                                            ($combobox_case_sensitive === 'no' && (tablo_suggestions[index_table][i].toUpperCase().indexOf(value_to_search.toUpperCase()) >= 0))
+                                            (
+                                                ($combobox_case_sensitive === 'yes' && (tablo_suggestions[index_table][i].indexOf(value_to_search) >= 0)) ||
+                                                ($combobox_case_sensitive === 'no' && (tablo_suggestions[index_table][i].toUpperCase().indexOf(value_to_search.toUpperCase()) >= 0))
+                                            )
                                         ) ||
                                         (
                                             $combobox_search_option === 'beginning' &&
-                                            ($combobox_case_sensitive === 'yes' && tablo_suggestions[index_table][i].substring(0, value_to_search.length) === value_to_search) ||
-                                            ($combobox_case_sensitive === 'no' && tablo_suggestions[index_table][i].substring(0, value_to_search.length).toUpperCase() === value_to_search.toUpperCase())
+                                            (
+                                                ($combobox_case_sensitive === 'yes' && tablo_suggestions[index_table][i].substring(0, value_to_search.length) === value_to_search) ||
+                                                ($combobox_case_sensitive === 'no' && tablo_suggestions[index_table][i].substring(0, value_to_search.length).toUpperCase() === value_to_search.toUpperCase())
+                                            )
                                         )
                                     ) {
                                         $suggestions.append('<div id="suggestion-' + index_table + '-' + counter + '" class="js-suggestion ' + $combobox_prefix_class + 'suggestion" tabindex="-1" role="option">' + tablo_suggestions[index_table][i] + '</div>');
@@ -362,4 +366,4 @@ $(document).ready(function() {
 
     }
 
-});
+});
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "title": "jQuery Accessible Autocomplete List, using ARIA",
   "name": "jquery-accessible-autocomplete-list-aria",
   "description": "This jQuery plugin will transform and enhance a simple text input with a datalist into a wonderful and shiny input with autocomplete, and accessible.",
-  "version": "1.5.5",
+  "version": "1.5.6",
   "main": "jquery-accessible-autocomplete-list-aria.js",
   "keywords": [
     "Accessibility",