bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-17 16:53:34 +00:00
Code Issues Releases Wiki Activity

Upgrade Angular (#1365)

Browse Source 
* Upgrade Angular

* Upgrade angular2-toaster and angulartisc2

* Remove ng-upgrade dependency

* Update app.component.ts
This commit is contained in:
Oscar Hinton
2020-08-18 22:13:37 +02:00
committed by GitHub
parent f158661afa
commit f00bb5e1d7
6 changed files with 482 additions and 1214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/popup/app-routing.module.ts
View File

@@ -1,4 +1,4 @@
import { NgModule } from '@angular/core';
import { NgModule, Injectable } from '@angular/core';
import {
ActivatedRouteSnapshot,
RouteReuseStrategy,
@@ -249,6 +249,7 @@ const routes: Routes = [
},
];
@Injectable()
export class NoRouteReuseStrategy implements RouteReuseStrategy {
shouldDetach(route: ActivatedRouteSnapshot) {
return false;

2
src/popup/app.module.ts
View File

@@ -149,7 +149,7 @@ registerLocaleData(localeZhTw, 'zh-TW');
FormsModule,
AppRoutingModule,
ServicesModule,
Angulartics2Module.forRoot([Angulartics2GoogleAnalytics], {
Angulartics2Module.forRoot({
pageTracking: {
clearQueryParams: true,
},

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

@@ -44,8 +44,8 @@ const RateUrls = {
templateUrl: 'settings.component.html',
})
export class SettingsComponent implements OnInit {
@ViewChild('vaultTimeoutSelect', { read: ElementRef }) vaultTimeoutSelectRef: ElementRef;
@ViewChild('vaultTimeoutActionSelect', { read: ElementRef }) vaultTimeoutActionSelectRef: ElementRef;
@ViewChild('vaultTimeoutSelect', { read: ElementRef, static: true }) vaultTimeoutSelectRef: ElementRef;
@ViewChild('vaultTimeoutActionSelect', { read: ElementRef, static: true }) vaultTimeoutActionSelectRef: ElementRef;
vaultTimeouts: any[];
vaultTimeout: number = null;
vaultTimeoutActions: any[];