From b07bbc14e1dc745543c7c95d6a846a789fbf2f81 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 25 Jul 2016 13:46:33 -0700 Subject: Clean up extension polyfill abstraction --- app/scripts/lib/extension-instance.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'app/scripts/lib/extension-instance.js') diff --git a/app/scripts/lib/extension-instance.js b/app/scripts/lib/extension-instance.js index eeab6c6d0..e0e7c948b 100644 --- a/app/scripts/lib/extension-instance.js +++ b/app/scripts/lib/extension-instance.js @@ -24,14 +24,9 @@ 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] = chrome ? chrome[api] : window[api] || browser.extension[api] }) } -- cgit v1.2.3 From be74589f49bbe977f881b17a0383cafa4336d9b4 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 25 Jul 2016 17:33:22 -0700 Subject: Fix extension tests --- app/scripts/lib/extension-instance.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'app/scripts/lib/extension-instance.js') diff --git a/app/scripts/lib/extension-instance.js b/app/scripts/lib/extension-instance.js index e0e7c948b..b9d0ed06d 100644 --- a/app/scripts/lib/extension-instance.js +++ b/app/scripts/lib/extension-instance.js @@ -26,7 +26,10 @@ function Extension () { const _this = this apis.forEach(function (api) { - _this[api] = chrome ? chrome[api] : window[api] || browser.extension[api] + _this[api] = chrome !== undefined && chrome[api] ? chrome[api] + : window[api] ? window[api] + : browser && browser.extension && browser.extension[api] + ? browser.extension[api] : null }) } -- cgit v1.2.3 From b43b9f13e97258d6d546e62a2fd280b44045a610 Mon Sep 17 00:00:00 2001 From: Dan Finlay Date: Mon, 25 Jul 2016 17:47:14 -0700 Subject: Fix integration tests --- app/scripts/lib/extension-instance.js | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'app/scripts/lib/extension-instance.js') diff --git a/app/scripts/lib/extension-instance.js b/app/scripts/lib/extension-instance.js index b9d0ed06d..eb3b8a1e9 100644 --- a/app/scripts/lib/extension-instance.js +++ b/app/scripts/lib/extension-instance.js @@ -26,10 +26,25 @@ function Extension () { const _this = this apis.forEach(function (api) { - _this[api] = chrome !== undefined && chrome[api] ? chrome[api] - : window[api] ? window[api] - : browser && browser.extension && browser.extension[api] - ? browser.extension[api] : null + + _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) {} + }) } -- cgit v1.2.3