bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 07:43:35 +00:00
Code Issues Releases Wiki Activity

use new get web vault url method

Browse Source
This commit is contained in:
Kyle Spearrin
2018-06-25 08:06:38 -04:00
parent 60bb4f6840
commit e365a3e892
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

Submodule jslib updated: e5db01083c...ca3b1c739c

11
src/popup/settings/settings.component.ts
View File

@@ -13,12 +13,12 @@ import { DeviceType } from 'jslib/enums/deviceType';
import { ConstantsService } from 'jslib/services/constants.service'; import { ConstantsService } from 'jslib/services/constants.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service';
import { I18nService } from 'jslib/abstractions/i18n.service'; import { I18nService } from 'jslib/abstractions/i18n.service';
import { LockService } from 'jslib/abstractions/lock.service'; import { LockService } from 'jslib/abstractions/lock.service';
import { MessagingService } from 'jslib/abstractions/messaging.service'; import { MessagingService } from 'jslib/abstractions/messaging.service';
import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service'; import { PlatformUtilsService } from 'jslib/abstractions/platformUtils.service';
import { StorageService } from 'jslib/abstractions/storage.service'; import { StorageService } from 'jslib/abstractions/storage.service';
import { EnvironmentService } from 'jslib/abstractions/environment.service';
const RateUrls = { const RateUrls = {
[DeviceType.Chrome]: [DeviceType.Chrome]:
@@ -42,7 +42,6 @@ const RateUrls = {
export class SettingsComponent implements OnInit { export class SettingsComponent implements OnInit {
lockOptions: any[]; lockOptions: any[];
lockOption: number = null; lockOption: number = null;
constructor(private platformUtilsService: PlatformUtilsService, private i18nService: I18nService, constructor(private platformUtilsService: PlatformUtilsService, private i18nService: I18nService,
private analytics: Angulartics2, private lockService: LockService, private analytics: Angulartics2, private lockService: LockService,
@@ -51,7 +50,6 @@ export class SettingsComponent implements OnInit {
} }
async ngOnInit() { async ngOnInit() {
const showOnLocked = !this.platformUtilsService.isFirefox() && !this.platformUtilsService.isEdge() const showOnLocked = !this.platformUtilsService.isFirefox() && !this.platformUtilsService.isEdge()
&& !this.platformUtilsService.isSafari(); && !this.platformUtilsService.isSafari();
@@ -134,8 +132,11 @@ export class SettingsComponent implements OnInit {
async webVault() { async webVault() {
this.analytics.eventTrack.next({ action: 'Clicked Web Vault' }); this.analytics.eventTrack.next({ action: 'Clicked Web Vault' });
let webVaultUrl = this.environmentService.webVaultUrl != undefined ? this.environmentService.webVaultUrl : 'https://vault.bitwarden.com'; let url = this.environmentService.getWebVaultUrl();
BrowserApi.createNewTab(webVaultUrl); if (url == null) {
url = 'https://vault.bitwarden.com';
}
BrowserApi.createNewTab(url);
} }
import() { import() {