diff options
author | Alex Yatskov <FooSoft@users.noreply.github.com> | 2019-08-28 19:41:30 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-28 19:41:30 -0700 |
commit | cd75f5b97dd47e252854d6381b49d2b7bc77c3ce (patch) | |
tree | d2152125ba1216acf2ac888bbda4d8326903d361 /ext/fg | |
parent | 7bf215617c9e54228bd5f5fe44b29f7b99de1abc (diff) | |
parent | a39a1fa9e4700d1189dfc5073b5fcb2557965671 (diff) |
Merge pull request #188 from toasted-nutbread/edge-support
Add support for Edge browser
Diffstat (limited to 'ext/fg')
-rw-r--r-- | ext/fg/float.html | 2 | ||||
-rw-r--r-- | ext/fg/js/float.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ext/fg/float.html b/ext/fg/float.html index 07f2d58b..0133e653 100644 --- a/ext/fg/float.html +++ b/ext/fg/float.html @@ -34,6 +34,8 @@ <script src="/mixed/lib/jquery.min.js"></script> <script src="/mixed/lib/wanakana.min.js"></script> + <script src="/mixed/js/extension.js"></script> + <script src="/fg/js/api.js"></script> <script src="/fg/js/util.js"></script> <script src="/fg/js/document.js"></script> diff --git a/ext/fg/js/float.js b/ext/fg/js/float.js index 090839a1..c0ec8a15 100644 --- a/ext/fg/js/float.js +++ b/ext/fg/js/float.js @@ -23,7 +23,7 @@ class DisplayFloat extends Display { this.autoPlayAudioTimer = null; this.styleNode = null; - this.dependencies = {...this.dependencies, ...{docRangeFromPoint, docSentenceExtract}}; + this.dependencies = Object.assign({}, this.dependencies, {docRangeFromPoint, docSentenceExtract}); $(window).on('message', utilAsync(this.onMessage.bind(this))); } |