aboutsummaryrefslogtreecommitdiff
path: root/ext/fg/js/float.js
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2019-09-02 11:47:14 -0700
committerAlex Yatskov <alex@foosoft.net>2019-09-02 11:47:14 -0700
commit5347da528bd07166b4686f45440d80a77f4888a3 (patch)
tree08bbfd0c859327ee9a08ca86afd222a222ced62b /ext/fg/js/float.js
parentda981c0b911dc5a697246006089b266fddba84a7 (diff)
parent4ac55da7dd5354e6c3495f04583352d0d863b7b6 (diff)
Merge branch 'master' into testing
Diffstat (limited to 'ext/fg/js/float.js')
-rw-r--r--ext/fg/js/float.js2
1 files changed, 1 insertions, 1 deletions
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)));
}