From f2ad94e54f2a110bf93aebfae33c808c497005be Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Thu, 12 Nov 2020 20:32:46 -0500 Subject: Text scanning options propagation (#1020) * Update Display.setOptionsContext to update options * Update how options context is updated in Popup * Omit optionsContext for some _showPopupContent calls * Remove extension unload * Disable modifier keys in frontend's options context * Update how text scanner passes modifiers to options context * Update how options context is passed to display * Update how display uses options context --- ext/fg/js/float.js | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'ext/fg/js/float.js') diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js index 7a6cae64..3b752df5 100644 --- a/ext/fg/js/float.js +++ b/ext/fg/js/float.js @@ -61,11 +61,6 @@ class DisplayFloat extends Display { this._invokeOwner('closePopup'); } - async setOptionsContext(optionsContext) { - super.setOptionsContext(optionsContext); - await this.updateOptions(); - } - async getDocumentTitle() { try { const targetFrameId = 0; @@ -99,9 +94,7 @@ class DisplayFloat extends Display { async _onMessageConfigure({frameId, ownerFrameId, popupId, optionsContext, childrenSupported, scale}) { this.ownerFrameId = ownerFrameId; - this.setOptionsContext(optionsContext); - - await this.updateOptions(); + await this.setOptionsContext(optionsContext); if (childrenSupported && !this._nestedPopupsPrepared) { const {depth} = optionsContext; -- cgit v1.2.3