diff options
| author | Stephen Blott | 2017-10-27 09:25:16 +0100 |
|---|---|---|
| committer | GitHub | 2017-10-27 09:25:16 +0100 |
| commit | 6f48cd04e7edcbc390c3253e9b95493249f4bb61 (patch) | |
| tree | 64723b1c8c851e886fe624734c86254de56fe4c4 /lib/settings.coffee | |
| parent | 03569d64b445780576f960d0553dc763c807de95 (diff) | |
| parent | 4cce9de9075474153a8299ab7430156bd6d194a9 (diff) | |
| download | vimium-6f48cd04e7edcbc390c3253e9b95493249f4bb61.tar.bz2 | |
Merge pull request #2742 from mrmr1993/ff-fix-fb
Add global objects to window.root, re-add to window on DOMLoad
Diffstat (limited to 'lib/settings.coffee')
| -rw-r--r-- | lib/settings.coffee | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/settings.coffee b/lib/settings.coffee index 38718990..11cf7557 100644 --- a/lib/settings.coffee +++ b/lib/settings.coffee @@ -218,5 +218,6 @@ if Utils.isBackgroundPage() # be removed after 1.58 has been out for sufficiently long. Settings.nuke "copyNonDefaultsToChromeStorage-20150717" -root = exports ? window +root = exports ? (window.root ?= {}) root.Settings = Settings +extend window, root unless exports? |