alex/yomichan
1
Fork 0
Code Releases Activity

Make secondary dictionary option controllers more consistent (#1577)

Browse Source
This commit is contained in:
toasted-nutbread 2021-03-31 18:53:08 -04:00 committed by GitHub
parent bdec71976a
commit f4af3f31ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/js/pages/settings/collapsible-dictionary-controller.js
View File

@ -24,17 +24,16 @@ class CollapsibleDictionaryController {
this._settingsController = settingsController; this._settingsController = settingsController;
this._getDictionaryInfoToken = null; this._getDictionaryInfoToken = null;
this._dictionaryInfoMap = new Map(); this._dictionaryInfoMap = new Map();
this._eventListeners = new EventListenerCollection();
this._container = null; this._container = null;
this._selects = []; this._selects = [];
this._allSelect = null; this._allSelect = null;
this._eventListeners = new EventListenerCollection();
} }
async prepare() { async prepare() {
this._container = document.querySelector('#collapsible-dictionary-list'); this._container = document.querySelector('#collapsible-dictionary-list');
await this._onDatabaseUpdated(); await this._onDatabaseUpdated();
await this._updateOptions();
yomichan.on('databaseUpdated', this._onDatabaseUpdated.bind(this)); yomichan.on('databaseUpdated', this._onDatabaseUpdated.bind(this));
this._settingsController.on('optionsChanged', this._onOptionsChanged.bind(this)); this._settingsController.on('optionsChanged', this._onOptionsChanged.bind(this));
@ -54,20 +53,19 @@ class CollapsibleDictionaryController {
this._dictionaryInfoMap.set(entry.title, entry); this._dictionaryInfoMap.set(entry.title, entry);
} }
await this._updateOptions(); const options = await this._settingsController.getOptions();
this._onOptionsChanged({options});
} }
_onOptionsChanged({options}) { _onOptionsChanged({options}) {
this._eventListeners.removeAllEventListeners(); this._eventListeners.removeAllEventListeners();
this._selects = []; this._selects = [];
const {dictionaries} = options;
const fragment = document.createDocumentFragment(); const fragment = document.createDocumentFragment();
this._setupAllSelect(fragment, options); this._setupAllSelect(fragment, options);
for (const dictionary of Object.keys(dictionaries)) { for (const dictionary of Object.keys(options.dictionaries)) {
const dictionaryInfo = this._dictionaryInfoMap.get(dictionary); const dictionaryInfo = this._dictionaryInfoMap.get(dictionary);
if (typeof dictionaryInfo === 'undefined') { continue; } if (typeof dictionaryInfo === 'undefined') { continue; }
@ -120,11 +118,6 @@ class CollapsibleDictionaryController {
return node.querySelector('.definitions-collapsible'); return node.querySelector('.definitions-collapsible');
} }
async _updateOptions() {
const options = await this._settingsController.getOptions();
this._onOptionsChanged({options});
}
async _updateAllSelectFresh() { async _updateAllSelectFresh() {
this._updateAllSelect(await this._settingsController.getOptions()); this._updateAllSelect(await this._settingsController.getOptions());
} }

34
ext/js/pages/settings/secondary-search-dictionary-controller.js
View File

@ -23,42 +23,58 @@ class SecondarySearchDictionaryController {
constructor(settingsController) { constructor(settingsController) {
this._settingsController = settingsController; this._settingsController = settingsController;
this._getDictionaryInfoToken = null; this._getDictionaryInfoToken = null;
this._container = null; this._dictionaryInfoMap = new Map();
this._eventListeners = new EventListenerCollection(); this._eventListeners = new EventListenerCollection();
this._container = null;
} }
async prepare() { async prepare() {
this._container = document.querySelector('#secondary-search-dictionary-list'); this._container = document.querySelector('#secondary-search-dictionary-list');
yomichan.on('databaseUpdated', this._onDatabaseUpdated.bind(this));
await this._onDatabaseUpdated(); await this._onDatabaseUpdated();
yomichan.on('databaseUpdated', this._onDatabaseUpdated.bind(this));
this._settingsController.on('optionsChanged', this._onOptionsChanged.bind(this));
} }
// Private // Private
async _onDatabaseUpdated() { async _onDatabaseUpdated() {
this._eventListeners.removeAllEventListeners();
const token = {}; const token = {};
this._getDictionaryInfoToken = token; this._getDictionaryInfoToken = token;
const dictionaries = await this._settingsController.getDictionaryInfo(); const dictionaries = await this._settingsController.getDictionaryInfo();
if (this._getDictionaryInfoToken !== token) { return; } if (this._getDictionaryInfoToken !== token) { return; }
this._getDictionaryInfoToken = null; this._getDictionaryInfoToken = null;
this._dictionaryInfoMap.clear();
for (const entry of dictionaries) {
this._dictionaryInfoMap.set(entry.title, entry);
}
const options = await this._settingsController.getOptions();
this._onOptionsChanged({options});
}
_onOptionsChanged({options}) {
this._eventListeners.removeAllEventListeners();
const fragment = document.createDocumentFragment(); const fragment = document.createDocumentFragment();
for (const {title, revision} of dictionaries) {
for (const dictionary of Object.keys(options.dictionaries)) {
const dictionaryInfo = this._dictionaryInfoMap.get(dictionary);
if (typeof dictionaryInfo === 'undefined') { continue; }
const node = this._settingsController.instantiateTemplate('secondary-search-dictionary'); const node = this._settingsController.instantiateTemplate('secondary-search-dictionary');
fragment.appendChild(node); fragment.appendChild(node);
const nameNode = node.querySelector('.dictionary-title'); const nameNode = node.querySelector('.dictionary-title');
nameNode.textContent = title; nameNode.textContent = dictionary;
const versionNode = node.querySelector('.dictionary-version'); const versionNode = node.querySelector('.dictionary-version');
versionNode.textContent = `rev.${revision}`; versionNode.textContent = `rev.${dictionaryInfo.revision}`;
const toggle = node.querySelector('.dictionary-allow-secondary-searches'); const toggle = node.querySelector('.dictionary-allow-secondary-searches');
toggle.dataset.setting = ObjectPropertyAccessor.getPathString(['dictionaries', title, 'allowSecondarySearches']); toggle.dataset.setting = ObjectPropertyAccessor.getPathString(['dictionaries', dictionary, 'allowSecondarySearches']);
this._eventListeners.addEventListener(toggle, 'settingChanged', this._onEnabledChanged.bind(this, node), false); this._eventListeners.addEventListener(toggle, 'settingChanged', this._onEnabledChanged.bind(this, node), false);
} }