Merge branch 'MDL-59867-master' of git://github.com/damyon/moodle

moodle · Sep 12, 2017 · 2cef0d3ade696b6a9ebbff0d3162d74d770af626 · 2cef0d3
2 parents fb6ff3c + b7df248
commit 2cef0d3ade696b6a9ebbff0d3162d74d770af626
Unified Split

Showing with 11 additions and 5 deletions.

+1 −1 lib/amd/build/form-autocomplete.min.js

+10 −4 lib/amd/src/form-autocomplete.js
diff --git a/lib/amd/build/form-autocomplete.min.js b/lib/amd/build/form-autocomplete.min.js
diff --git a/lib/amd/src/form-autocomplete.js b/lib/amd/src/form-autocomplete.js
@@ -37,6 +37,8 @@ define(['jquery', 'core/log', 'core/str', 'core/templates', 'core/notification']
        UP: 38
    };

+    var uniqueId = $.now();
+
    /**
     * Make an item in the selection list "active".
     *
@@ -786,11 +788,15 @@ define(['jquery', 'core/log', 'core/str', 'core/templates', 'core/notification']
            // Find or generate some ids.
            var state = {
                selectId: originalSelect.attr('id'),
-                inputId: 'form_autocomplete_input-' + $.now(),
-                suggestionsId: 'form_autocomplete_suggestions-' + $.now(),
-                selectionId: 'form_autocomplete_selection-' + $.now(),
-                downArrowId: 'form_autocomplete_downarrow-' + $.now()
+                inputId: 'form_autocomplete_input-' + uniqueId,
+                suggestionsId: 'form_autocomplete_suggestions-' + uniqueId,
+                selectionId: 'form_autocomplete_selection-' + uniqueId,
+                downArrowId: 'form_autocomplete_downarrow-' + uniqueId
            };
+
+            // Increment the unique counter so we don't get duplicates ever.
+            uniqueId++;
+
            options.multiple = originalSelect.attr('multiple');

            if (typeof closeSuggestionsOnSelect !== "undefined") {