diff options
| author | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2019-10-05 21:38:13 -0400 | 
|---|---|---|
| committer | toasted-nutbread <toasted-nutbread@users.noreply.github.com> | 2019-10-05 21:40:10 -0400 | 
| commit | 2255fadf52bff17d183f48e0bc72a078568481f2 (patch) | |
| tree | fd462850b429722b969dbd255555ff3db3b9ebce | |
| parent | bac237336e4578e339069a8d9d8f83703a3cee5d (diff) | |
Rename Popup.setVisible to setVisibleOverride
| -rw-r--r-- | ext/fg/js/frontend.js | 4 | ||||
| -rw-r--r-- | ext/fg/js/popup-proxy-host.js | 6 | ||||
| -rw-r--r-- | ext/fg/js/popup-proxy.js | 4 | ||||
| -rw-r--r-- | ext/fg/js/popup.js | 2 | ||||
| -rw-r--r-- | ext/mixed/js/display.js | 8 | 
5 files changed, 12 insertions, 12 deletions
| diff --git a/ext/fg/js/frontend.js b/ext/fg/js/frontend.js index 58dc0e4a..3fa70357 100644 --- a/ext/fg/js/frontend.js +++ b/ext/fg/js/frontend.js @@ -527,8 +527,8 @@ Frontend.runtimeMessageHandlers = {          self.updateOptions();      }, -    popupSetVisible: (self, {visible}) => { -        self.popup.setVisible(visible); +    popupSetVisibleOverride: (self, {visible}) => { +        self.popup.setVisibleOverride(visible);      }  }; diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js index cb9741be..7fad71c1 100644 --- a/ext/fg/js/popup-proxy-host.js +++ b/ext/fg/js/popup-proxy-host.js @@ -41,7 +41,7 @@ class PopupProxyHost {              show: ({id, elementRect, options}) => this.show(id, elementRect, options),              showOrphaned: ({id, elementRect, options}) => this.show(id, elementRect, options),              hide: ({id, changeFocus}) => this.hide(id, changeFocus), -            setVisible: ({id, visible}) => this.setVisible(id, visible), +            setVisibleOverride: ({id, visible}) => this.setVisibleOverride(id, visible),              containsPoint: ({id, x, y}) => this.containsPoint(id, x, y),              termsShow: ({id, elementRect, writingMode, definitions, options, context}) => this.termsShow(id, elementRect, writingMode, definitions, options, context),              kanjiShow: ({id, elementRect, writingMode, definitions, options, context}) => this.kanjiShow(id, elementRect, writingMode, definitions, options, context), @@ -103,9 +103,9 @@ class PopupProxyHost {          return popup.hide(changeFocus);      } -    async setVisible(id, visible) { +    async setVisibleOverride(id, visible) {          const popup = this.getPopup(id); -        return popup.setVisible(visible); +        return popup.setVisibleOverride(visible);      }      async containsPoint(id, x, y) { diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js index 072cebc9..99b28549 100644 --- a/ext/fg/js/popup-proxy.js +++ b/ext/fg/js/popup-proxy.js @@ -65,9 +65,9 @@ class PopupProxy {          return await this.invokeHostApi('hide', {id: this.id, changeFocus});      } -    async setVisible(visible) { +    async setVisibleOverride(visible) {          const id = await this.getPopupId(); -        return await this.invokeHostApi('setVisible', {id, visible}); +        return await this.invokeHostApi('setVisibleOverride', {id, visible});      }      async containsPoint(x, y) { diff --git a/ext/fg/js/popup.js b/ext/fg/js/popup.js index 9dff6f28..5509c98c 100644 --- a/ext/fg/js/popup.js +++ b/ext/fg/js/popup.js @@ -238,7 +238,7 @@ class Popup {          return this.isInjected && this.container.style.visibility !== 'hidden';      } -    setVisible(visible) { +    setVisibleOverride(visible) {          if (visible) {              this.container.style.setProperty('display', '');          } else { diff --git a/ext/mixed/js/display.js b/ext/mixed/js/display.js index dc64dbea..b70fa4b8 100644 --- a/ext/mixed/js/display.js +++ b/ext/mixed/js/display.js @@ -445,7 +445,7 @@ class Display {      async getScreenshot() {          try { -            await this.setPopupVisible(false); +            await this.setPopupVisibleOverride(false);              await Display.delay(1); // Wait for popup to be hidden.              const {format, quality} = this.options.anki.screenshot; @@ -454,7 +454,7 @@ class Display {              return {dataUrl, format};          } finally { -            await this.setPopupVisible(true); +            await this.setPopupVisibleOverride(true);          }      } @@ -462,8 +462,8 @@ class Display {          return this.options.general.resultOutputMode === 'merge' ? 0 : -1;      } -    setPopupVisible(visible) { -        return apiForward('popupSetVisible', {visible}); +    setPopupVisibleOverride(visible) { +        return apiForward('popupSetVisibleOverride', {visible});      }      setSpinnerVisible(visible) { |