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

adjustments for mas

Browse Source
This commit is contained in:
Kyle Spearrin 2018-02-26 23:43:27 -05:00
parent 8db8557731
commit 36e0e32d10
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jslib

@ -1 +1 @@
Subproject commit b747830c5b4360bf50d6e02126ebaab24e3028d5
Subproject commit 902d72457cbeb99ef5d9eb69945ad43658f69277

3
src/app/accounts/premium.component.html
View File

@ -42,7 +42,8 @@
</div>
</div>
<div class="modal-footer">
<button type="button" class="primary" appBlurClick (click)="manage()" *ngIf="isPremium">
<button type="button" class="primary" appBlurClick (click)="manage()"
*ngIf="isPremium && showManageMembership">
<b>{{'premiumManage' | i18n}}</b>
</button>
<button type="button" class="primary" appBlurClick (click)="purchase()" *ngIf="!isPremium">

2
src/app/accounts/premium.component.ts
View File

@ -19,6 +19,7 @@ import { TokenService } from 'jslib/abstractions/token.service';
})
export class PremiumComponent implements OnInit {
isPremium: boolean = false;
showManageMembership: boolean = false;
price: string = '$10';
refreshPromise: Promise<any>;
@ -28,6 +29,7 @@ export class PremiumComponent implements OnInit {
async ngOnInit() {
this.isPremium = this.tokenService.getPremium();
this.showManageMembership = !this.platformUtilsService.isMacAppStore();
}
async refresh() {

6
src/main/menu.main.ts
View File

@ -11,6 +11,7 @@ import {
} from 'electron';
import { Main } from '../main';
import { isMacAppStore } from '../scripts/utils';
import { ConstantsService } from 'jslib/services/constants.service';
@ -521,9 +522,12 @@ export class MenuMain {
label: this.main.i18nService.t('aboutBitwarden'),
role: 'about',
},
updateMenuItem,
];
if (!isMacAppStore()) {
firstMenuPart.push(updateMenuItem);
}
template.unshift({
label: 'Bitwarden',
submenu: firstMenuPart.concat(firstMenuOptions, [