aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib/extension-instance.js
diff options
context:
space:
mode:
authorFrankie <frankie.pangilinan@consensys.net>2016-08-26 07:06:54 +0800
committerFrankie <frankie.pangilinan@consensys.net>2016-08-26 07:06:54 +0800
commit547894ed391f2d258c46ff382d4b211d18d81a7b (patch)
tree9425bee50dae3f6d254462363b5f60b837cb2e27 /app/scripts/lib/extension-instance.js
parent250cf8cc23305e33f4fc26a1711996ebc54fd9ad (diff)
parent78f73038e789f4483f728a7cc9ea1c68b0b3d7fa (diff)
downloadtangerine-wallet-browser-547894ed391f2d258c46ff382d4b211d18d81a7b.tar.gz
tangerine-wallet-browser-547894ed391f2d258c46ff382d4b211d18d81a7b.tar.zst
tangerine-wallet-browser-547894ed391f2d258c46ff382d4b211d18d81a7b.zip
Merge branch 'master' into i#563forgotPassword
Diffstat (limited to 'app/scripts/lib/extension-instance.js')
-rw-r--r--app/scripts/lib/extension-instance.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/app/scripts/lib/extension-instance.js b/app/scripts/lib/extension-instance.js
index eb3b8a1e9..1098130e3 100644
--- a/app/scripts/lib/extension-instance.js
+++ b/app/scripts/lib/extension-instance.js
@@ -42,6 +42,12 @@ function Extension () {
} catch (e) {}
try {
+ if (browser[api]) {
+ _this[api] = browser[api]
+ }
+ } catch (e) {}
+
+ try {
_this.api = browser.extension[api]
} catch (e) {}