L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-55988 Forms: Stop autocomplete triggering warning on unload

Browse Source 
Prevents autocomplete fields marking a form "dirty" when initialised,
and allows them to honour the "ignoredirty" class.
This commit is contained in:
Mark Johnson
2016-09-16 13:09:05 +01:00
parent cb3b8c222e
commit a4a2d1edd0
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/amd/build/form-autocomplete.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
lib/amd/src/form-autocomplete.js
+9 -4
View File
@@ -368,8 +368,12 @@ define(['jquery', 'core/log', 'core/str', 'core/templates', 'core/notification']
* @param {Object} options Original options for this autocomplete element.
* @param {Object} state State variables for this autocomplete element.
* @param {JQuery} originalSelect The JQuery object matching the hidden select list.
* @param {boolean} markDirty Should the form be marked dirty after this update?
*/
var updateSelectionList = function(options, state, originalSelect) {
var updateSelectionList = function(options, state, originalSelect, markDirty) {
if (markDirty === undefined) {
markDirty = true;
}
// Build up a valid context to re-render the template.
var items = [];
var newSelection = $(document.getElementById(state.selectionId));
@@ -402,8 +406,8 @@ define(['jquery', 'core/log', 'core/str', 'core/templates', 'core/notification']
}).fail(notification.exception);
// Because this function get's called after changing the selection, this is a good place
// to trigger a change notification.
if (typeof M.core_formchangechecker != 'undefined') {
M.core_formchangechecker.set_form_changed();
if (typeof M.core_formchangechecker != 'undefined' && markDirty) {
M.core_formchangechecker.set_form_changed({target: originalSelect});
}
originalSelect.change();
};
@@ -726,6 +730,7 @@ define(['jquery', 'core/log', 'core/str', 'core/templates', 'core/notification']
var context = $.extend({}, options, state);
context.options = suggestions;
context.items = [];
context.class = originalSelect.attr('class');
var renderInput = templates.render('core/form_autocomplete_input', context);
var renderDatalist = templates.render('core/form_autocomplete_suggestions', context);
@@ -759,7 +764,7 @@ define(['jquery', 'core/log', 'core/str', 'core/templates', 'core/notification']
});
}
// Show the current values in the selection list.
updateSelectionList(options, state, originalSelect);
updateSelectionList(options, state, originalSelect, false);
});
}
};
lib/templates/form_autocomplete_input.mustache
+2 -2
View File
@@ -36,8 +36,8 @@
{ "inputID": 1, "suggestionsId": 2, "selectionId": 3, "downArrowId": 4, "placeholder": "Select something" }
}}
{{#showSuggestions}}
<input type="text" id="{{inputId}}" list="{{suggestionsId}}" placeholder="{{placeholder}}" role="combobox" aria-expanded="false" autocomplete="off" autocorrect="off" autocapitalize="off" aria-autocomplete="list" aria-owns="{{suggestionsId}} {{selectionId}}"/><span class="form-autocomplete-downarrow" id="{{downArrowId}}">&#x25BC;</span>
<input type="text" id="{{inputId}}" {{#class}}class="{{class}}" {{/class}}list="{{suggestionsId}}" placeholder="{{placeholder}}" role="combobox" aria-expanded="false" autocomplete="off" autocorrect="off" autocapitalize="off" aria-autocomplete="list" aria-owns="{{suggestionsId}} {{selectionId}}"/><span class="form-autocomplete-downarrow" id="{{downArrowId}}">&#x25BC;</span>
{{/showSuggestions}}
{{^showSuggestions}}
<input type="text" id="{{inputId}}" placeholder="{{placeholder}}" role="textbox" aria-owns="{{selectionId}}"/>
<input type="text" id="{{inputId}}" {{#class}}class="{{class}}" {{/class}} placeholder="{{placeholder}}" role="textbox" aria-owns="{{selectionId}}"/>
{{/showSuggestions}}