alex/yomichan
1
Fork 0
Code Releases Activity

Display fixes (#1648)

Browse Source 
* Fix incorrect tabId/frameId being used

* Only enable nested popups if the tabId is valid

* Remove unused APIs
This commit is contained in:
toasted-nutbread 2021-05-01 17:30:17 -04:00 committed by GitHub
parent c514bbc4fb
commit 46f60619d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ext/js/display/display.js
View File

@ -194,14 +194,6 @@ class Display extends EventDispatcher {
return this._progressIndicatorVisible; return this._progressIndicatorVisible;
} }
get tabId() {
return this._tabId;
}
get frameId() {
return this._frameId;
}
get parentPopupId() { get parentPopupId() {
return this._parentPopupId; return this._parentPopupId;
} }
@ -1635,10 +1627,14 @@ class Display extends EventDispatcher {
async _updateNestedFrontend(options) { async _updateNestedFrontend(options) {
const isSearchPage = (this._pageType === 'search'); const isSearchPage = (this._pageType === 'search');
const isEnabled = this._childrenSupported && ( const isEnabled = (
this._childrenSupported &&
typeof this._tabId === 'number' &&
(
(isSearchPage) ? (isSearchPage) ?
(options.scanning.enableOnSearchPage) : (options.scanning.enableOnSearchPage) :
(this._depth < options.scanning.popupNestingMaxDepth) (this._depth < options.scanning.popupNestingMaxDepth)
)
); );
if (this._frontend === null) { if (this._frontend === null) {

4
ext/js/display/search-display-controller.js
View File

@ -368,8 +368,8 @@ class SearchDisplayController {
dictionaryEntries: null, dictionaryEntries: null,
animate, animate,
contentOrigin: { contentOrigin: {
tabId: this.tabId, tabId: this._tabId,
frameId: this.frameId frameId: this._frameId
} }
} }
}; };