Merge pull request #3036 from limonspb/presets_select_firmware

Presets bugfix: automatically preselect current FC firmware version
10.9-maintenance
haslinghuis 2022-10-11 18:16:11 +02:00 committed by GitHub
commit 09b98b0c1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions

View File

@ -335,13 +335,16 @@ presets.multipleSelectComponentScrollFix = function() {
when the number of items 199+. More details here:
https://github.com/wenzhixin/multiple-select/issues/552
*/
return new Promise((resolve) => {
GUI.timeout_add('hack_fix_multipleselect_scroll', () => {
this._selectCategory.multipleSelect('refresh');
this._selectKeyword.multipleSelect('refresh');
this._selectAuthor.multipleSelect('refresh');
this._selectFirmwareVersion.multipleSelect('refresh');
this._selectStatus.multipleSelect('refresh');
resolve();
}, 100);
});
};
presets.checkPresetSourceVersion = function() {
@ -375,14 +378,12 @@ presets.prepareFilterFields = function() {
this.prepareFilterSelectField(this._selectAuthor, this.presetsRepo.index.uniqueValues.author, 1);
this.prepareFilterSelectField(this._selectFirmwareVersion, this.presetsRepo.index.uniqueValues.firmware_version, 2);
this.prepareFilterSelectField(this._selectStatus, this.presetsRepo.index.settings.PresetStatusEnum, 2);
this.multipleSelectComponentScrollFix();
this.preselectFilterFields();
this._inputTextFilter.on('input', () => this.updateSearchResults());
this._freezeSearch = false;
this.updateSearchResults();
this.multipleSelectComponentScrollFix().then(() => {
this.preselectFilterFields();
this._inputTextFilter.on('input', () => this.updateSearchResults());
this._freezeSearch = false;
this.updateSearchResults();
});
};
presets.preselectFilterFields = function() {