alex/yomichan
1
Fork 0
Code Releases Activity

Dictionary controller updates (#941)

Browse Source 
* Rename action

* Store more state information

* Conditional checks for details toggle links

* Add support for hiding/showing details via menu
This commit is contained in:
toasted-nutbread 2020-10-18 19:35:09 -04:00 committed by GitHub
parent ce17a47b5e
commit 9fa2ebddc8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ext/bg/js/settings/dictionary-controller.js
View File

@ -29,6 +29,8 @@ class DictionaryEntry {
this._dictionaryInfo = dictionaryInfo; this._dictionaryInfo = dictionaryInfo;
this._eventListeners = new EventListenerCollection(); this._eventListeners = new EventListenerCollection();
this._detailsContainer = null; this._detailsContainer = null;
this._hasDetails = false;
this._hasCounts = false;
} }
get node() { get node() {
@ -58,13 +60,14 @@ class DictionaryEntry {
const wildcardSupportedCheckbox = node.querySelector('.dictionary-prefix-wildcard-searches-supported'); const wildcardSupportedCheckbox = node.querySelector('.dictionary-prefix-wildcard-searches-supported');
const hasDetails = this._setupDetails(detailsTable); const hasDetails = this._setupDetails(detailsTable);
this._hasDetails = hasDetails;
titleNode.textContent = title; titleNode.textContent = title;
versionNode.textContent = `rev.${revision}`; versionNode.textContent = `rev.${revision}`;
wildcardSupportedCheckbox.checked = !!prefixWildcardsSupported; wildcardSupportedCheckbox.checked = !!prefixWildcardsSupported;
outdatedContainer.hidden = (version >= 3); outdatedContainer.hidden = (version >= 3);
detailsToggleLink.hidden = !hasDetails; if (detailsToggleLink !== null) { detailsToggleLink.hidden = !hasDetails; }
enabledCheckbox.dataset.setting = ObjectPropertyAccessor.getPathString(['dictionaries', title, 'enabled']); enabledCheckbox.dataset.setting = ObjectPropertyAccessor.getPathString(['dictionaries', title, 'enabled']);
allowSecondarySearchesCheckbox.dataset.setting = ObjectPropertyAccessor.getPathString(['dictionaries', title, 'allowSecondarySearches']); allowSecondarySearchesCheckbox.dataset.setting = ObjectPropertyAccessor.getPathString(['dictionaries', title, 'allowSecondarySearches']);
@ -74,9 +77,10 @@ class DictionaryEntry {
this._eventListeners.addEventListener(deleteButton, 'click', this._onDeleteButtonClicked.bind(this), false); this._eventListeners.addEventListener(deleteButton, 'click', this._onDeleteButtonClicked.bind(this), false);
} }
if (menuButton !== null) { if (menuButton !== null) {
this._eventListeners.addEventListener(menuButton, 'menuOpened', this._onMenuOpened.bind(this), false);
this._eventListeners.addEventListener(menuButton, 'menuClosed', this._onMenuClosed.bind(this), false); this._eventListeners.addEventListener(menuButton, 'menuClosed', this._onMenuClosed.bind(this), false);
} }
if (this._detailsContainer !== null) { if (detailsToggleLink !== null && this._detailsContainer !== null) {
this._eventListeners.addEventListener(detailsToggleLink, 'click', this._onDetailsToggleLinkClicked.bind(this), false); this._eventListeners.addEventListener(detailsToggleLink, 'click', this._onDetailsToggleLinkClicked.bind(this), false);
} }
this._eventListeners.addEventListener(priorityInput, 'settingChanged', this._onPriorityChanged.bind(this), false); this._eventListeners.addEventListener(priorityInput, 'settingChanged', this._onPriorityChanged.bind(this), false);
@ -94,9 +98,7 @@ class DictionaryEntry {
const node = this._node.querySelector('.dictionary-counts'); const node = this._node.querySelector('.dictionary-counts');
node.textContent = JSON.stringify({info: this._dictionaryInfo, counts}, null, 4); node.textContent = JSON.stringify({info: this._dictionaryInfo, counts}, null, 4);
node.hidden = false; node.hidden = false;
this._hasCounts = true;
const show = this._node.querySelector('.dictionary-details-toggle-link');
if (show !== null) { show.hidden = false; }
} }
// Private // Private
@ -106,12 +108,34 @@ class DictionaryEntry {
this._delete(); this._delete();
} }
_onMenuOpened(e) {
const {detail: {menu}} = e;
const showDetails = menu.querySelector('.popup-menu-item[data-menu-action="showDetails"]');
const hideDetails = menu.querySelector('.popup-menu-item[data-menu-action="hideDetails"]');
const hasDetails = (this._detailsContainer !== null && (this._hasDetails || this._hasCounts));
const detailsVisible = (hasDetails && !this._detailsContainer.hidden);
if (showDetails !== null) {
showDetails.hidden = detailsVisible;
showDetails.disabled = !hasDetails;
}
if (hideDetails !== null) {
hideDetails.hidden = !detailsVisible;
hideDetails.disabled = !hasDetails;
}
}
_onMenuClosed(e) { _onMenuClosed(e) {
const {detail: {action}} = e; const {detail: {action}} = e;
switch (action) { switch (action) {
case 'remove': case 'delete':
this._delete(); this._delete();
break; break;
case 'showDetails':
if (this._detailsContainer !== null) { this._detailsContainer.hidden = false; }
break;
case 'hideDetails':
if (this._detailsContainer !== null) { this._detailsContainer.hidden = true; }
break;
} }
} }