Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-02 08:40:08 +01:00
Code Issues Projects Releases Wiki Activity

proper safari detection in utils

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-13 11:57:20 -04:00
parent 9e8094468b
commit fba1731cb4
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/browserPlatformUtils.service.ts
View File

@ -24,7 +24,9 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService
return this.deviceCache; return this.deviceCache;
} }
if (navigator.userAgent.indexOf(' Firefox/') !== -1 || navigator.userAgent.indexOf(' Gecko/') !== -1) { if (BrowserApi.isSafariApi) {
this.deviceCache = DeviceType.SafariExtension;
} else if (navigator.userAgent.indexOf(' Firefox/') !== -1 || navigator.userAgent.indexOf(' Gecko/') !== -1) {
this.deviceCache = DeviceType.FirefoxExtension; this.deviceCache = DeviceType.FirefoxExtension;
} else if ((!!(window as any).opr && !!opr.addons) || !!(window as any).opera || } else if ((!!(window as any).opr && !!opr.addons) || !!(window as any).opera ||
navigator.userAgent.indexOf(' OPR/') >= 0) { navigator.userAgent.indexOf(' OPR/') >= 0) {
@ -33,9 +35,6 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService
this.deviceCache = DeviceType.EdgeExtension; this.deviceCache = DeviceType.EdgeExtension;
} else if (navigator.userAgent.indexOf(' Vivaldi/') !== -1) { } else if (navigator.userAgent.indexOf(' Vivaldi/') !== -1) {
this.deviceCache = DeviceType.VivaldiExtension; this.deviceCache = DeviceType.VivaldiExtension;
} else if ((window as any).safari && navigator.userAgent.indexOf(' Safari/') !== -1 &&
navigator.userAgent.indexOf('Chrome') === -1) {
this.deviceCache = DeviceType.SafariExtension;
} else if ((window as any).chrome && navigator.userAgent.indexOf(' Chrome/') !== -1) { } else if ((window as any).chrome && navigator.userAgent.indexOf(' Chrome/') !== -1) {
this.deviceCache = DeviceType.ChromeExtension; this.deviceCache = DeviceType.ChromeExtension;
} }
@ -210,7 +209,7 @@ export default class BrowserPlatformUtilsService implements PlatformUtilsService
try { try {
// Security exception may be thrown by some browsers. // Security exception may be thrown by some browsers.
if (doc.execCommand('copy') && !clearing && this.clipboardWriteCallback != null) { if (doc.execCommand('copy') && !clearing && this.clipboardWriteCallback != null) {
this.clipboardWriteCallback(text, clearMs); this.clipboardWriteCallback(text, clearMs);
} }
} catch (e) { } catch (e) {