diff options
| author | Alex Yatskov <FooSoft@users.noreply.github.com> | 2019-09-12 19:48:22 -0700 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 19:48:22 -0700 | 
| commit | ec816e676771b53f6eb2c9c68e1742830c9fd194 (patch) | |
| tree | d92ed7c524558f1187d2b07856fc8923450a525b | |
| parent | 60b32a4a1ae6318c3c9ccb1fcccf66853f2b686f (diff) | |
| parent | 76aa30cebad504c3d6811029384713044d4d0428 (diff) | |
Merge pull request #207 from toasted-nutbread/popup-proxy-writing-mode
Add writingMode to PopupProxy* termsShow and kanjiShow
| -rw-r--r-- | ext/fg/js/popup-proxy-host.js | 12 | ||||
| -rw-r--r-- | ext/fg/js/popup-proxy.js | 8 | 
2 files changed, 10 insertions, 10 deletions
| diff --git a/ext/fg/js/popup-proxy-host.js b/ext/fg/js/popup-proxy-host.js index fa61aeb4..041900ed 100644 --- a/ext/fg/js/popup-proxy-host.js +++ b/ext/fg/js/popup-proxy-host.js @@ -43,8 +43,8 @@ class PopupProxyHost {              hide: ({id}) => this.hide(id),              setVisible: ({id, visible}) => this.setVisible(id, visible),              containsPoint: ({id, point}) => this.containsPoint(id, point), -            termsShow: ({id, elementRect, definitions, options, context}) => this.termsShow(id, elementRect, definitions, options, context), -            kanjiShow: ({id, elementRect, definitions, options, context}) => this.kanjiShow(id, elementRect, definitions, options, context), +            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),              clearAutoPlayTimer: ({id}) => this.clearAutoPlayTimer(id)          });      } @@ -113,16 +113,16 @@ class PopupProxyHost {          return await popup.containsPoint(point);      } -    async termsShow(id, elementRect, definitions, options, context) { +    async termsShow(id, elementRect, writingMode, definitions, options, context) {          const popup = this.getPopup(id);          elementRect = this.jsonRectToDOMRect(popup, elementRect); -        return await popup.termsShow(elementRect, definitions, options, context); +        return await popup.termsShow(elementRect, writingMode, definitions, options, context);      } -    async kanjiShow(id, elementRect, definitions, options, context) { +    async kanjiShow(id, elementRect, writingMode, definitions, options, context) {          const popup = this.getPopup(id);          elementRect = this.jsonRectToDOMRect(popup, elementRect); -        return await popup.kanjiShow(elementRect, definitions, options, context); +        return await popup.kanjiShow(elementRect, writingMode, definitions, options, context);      }      async clearAutoPlayTimer(id) { diff --git a/ext/fg/js/popup-proxy.js b/ext/fg/js/popup-proxy.js index 56e710eb..c3a7bff0 100644 --- a/ext/fg/js/popup-proxy.js +++ b/ext/fg/js/popup-proxy.js @@ -76,16 +76,16 @@ class PopupProxy {          return await this.invokeHostApi('containsPoint', {id: this.id, point});      } -    async termsShow(elementRect, definitions, options, context) { +    async termsShow(elementRect, writingMode, definitions, options, context) {          const id = await this.getPopupId();          elementRect = PopupProxy.DOMRectToJson(elementRect); -        return await this.invokeHostApi('termsShow', {id, elementRect, definitions, options, context}); +        return await this.invokeHostApi('termsShow', {id, elementRect, writingMode, definitions, options, context});      } -    async kanjiShow(elementRect, definitions, options, context) { +    async kanjiShow(elementRect, writingMode, definitions, options, context) {          const id = await this.getPopupId();          elementRect = PopupProxy.DOMRectToJson(elementRect); -        return await this.invokeHostApi('kanjiShow', {id, elementRect, definitions, options, context}); +        return await this.invokeHostApi('kanjiShow', {id, elementRect, writingMode, definitions, options, context});      }      async clearAutoPlayTimer() { |