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

dont show popout in firefox sidebar

Browse Source
This commit is contained in:
Kyle Spearrin 2018-04-13 23:37:57 -04:00
parent 57a0c0fc75
commit 38f55d7147
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/popup/components/pop-out.component.ts
View File

@ -20,11 +20,14 @@ export class PopOutComponent implements OnInit {
@Input() show = true;
constructor(private analytics: Angulartics2, private platformUtilsService: PlatformUtilsService,
private popupUtilsService: PopupUtilsService) {}
private popupUtilsService: PopupUtilsService) { }
ngOnInit() {
if (this.show) {
this.show = !this.platformUtilsService.isSafari();
if (this.show && this.popupUtilsService.inSidebar(window) && this.platformUtilsService.isFirefox()) {
this.show = false;
}
}
}

6
src/popup/scss/base.scss
View File

@ -177,7 +177,7 @@ header {
.fa {
position: absolute;
top: 15px;
left: 10px;
left: 20px;
color: lighten($brand-primary, 30%);
}
@ -204,6 +204,10 @@ header {
.left + .search {
padding-left: 0;
.fa {
left: 10px;
}
}
.search + .right {

2
src/popup/vault/groupings.component.html
View File

@ -1,5 +1,5 @@
<header>
<div class="left">
<div class="left" *ngIf="showLeftHeader">
<app-pop-out></app-pop-out>
</div>
<div class="search">

2
src/popup/vault/groupings.component.ts
View File

@ -50,6 +50,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
searchText: string;
state: any;
scopeState: any;
showLeftHeader = true;
private loadedTimeout: number;
private selectedTimeout: number;
@ -77,6 +78,7 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
}
async ngOnInit() {
this.showLeftHeader = !(this.popupUtils.inSidebar(window) && this.platformUtilsService.isFirefox());
this.stateService.remove('CiphersComponent');
this.broadcasterService.subscribe(ComponentId, (message: any) => {