diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-07-26 09:37:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-26 09:37:10 +0800 |
| commit | 04f755a132e80fc018e42e2104f6c6feffeb183f (patch) | |
| tree | c3f1e7a428cff016caa214712d49dead45ebf335 /app/scripts/lib | |
| parent | 11dfb8e869d425204512b250b00ef71ed85a14cc (diff) | |
| parent | 0eb7354c1acc036452115351485d0fbc94b4bb08 (diff) | |
| download | tangerine-wallet-browser-04f755a132e80fc018e42e2104f6c6feffeb183f.tar.gz tangerine-wallet-browser-04f755a132e80fc018e42e2104f6c6feffeb183f.tar.zst tangerine-wallet-browser-04f755a132e80fc018e42e2104f6c6feffeb183f.zip | |
Merge pull request #482 from MetaMask/FirefoxCompatibility
Fix inpage script race condition
Diffstat (limited to 'app/scripts/lib')
| -rw-r--r-- | app/scripts/lib/extension-instance.js | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/app/scripts/lib/extension-instance.js b/app/scripts/lib/extension-instance.js index eeab6c6d0..eb3b8a1e9 100644 --- a/app/scripts/lib/extension-instance.js +++ b/app/scripts/lib/extension-instance.js @@ -24,14 +24,27 @@ const apis = [ function Extension () { const _this = this - let global = window - - if (window.chrome) { - global = window.chrome - } apis.forEach(function (api) { - _this[api] = global[api] + + _this[api] = null + + try { + if (chrome[api]) { + _this[api] = chrome[api] + } + } catch (e) {} + + try { + if (window[api]) { + _this[api] = window[api] + } + } catch (e) {} + + try { + _this.api = browser.extension[api] + } catch (e) {} + }) } |