From 4fe710f8e7d33ace112ca0a0048ce94e6ea5065a Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 9 May 2018 08:39:12 -0400 Subject: [PATCH] detect safari browser properly --- jslib | 2 +- src/content/autofiller.js | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jslib b/jslib index 4614b4a185..9de9c1655c 160000 --- a/jslib +++ b/jslib @@ -1 +1 @@ -Subproject commit 4614b4a1859999326df6ab6f746babbca343d19d +Subproject commit 9de9c1655c9a325443fdabfc74630f06e20f8d9a diff --git a/src/content/autofiller.js b/src/content/autofiller.js index 1d160ad30d..37d49d39d9 100644 --- a/src/content/autofiller.js +++ b/src/content/autofiller.js @@ -1,8 +1,9 @@ document.addEventListener('DOMContentLoaded', (event) => { let pageHref = null; + const isSafari = (typeof safari !== 'undefined') && navigator.userAgent.indexOf(' Safari/') !== -1 && + navigator.userAgent.indexOf('Chrome') === -1; - if ((typeof safari !== 'undefined') && navigator.userAgent.indexOf(' Safari/') !== -1 && - navigator.userAgent.indexOf('Chrome') === -1) { + if (isSafari) { const responseCommand = 'autofillerAutofillOnPageLoadEnabledResponse'; safari.self.tab.dispatchMessage('bitwarden', { command: 'bgGetDataForTab', @@ -32,7 +33,7 @@ document.addEventListener('DOMContentLoaded', (event) => { sender: 'autofiller' }; - if ((typeof safari !== 'undefined')) { + if (isSafari) { safari.self.tab.dispatchMessage('bitwarden', msg); } else { chrome.runtime.sendMessage(msg);