Revert "Safari Web Extension Port from App Extension"

src/popup/accounts/two-factor.component.ts

@@ -58,12 +58,13 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
             // ref: https://bugzilla.mozilla.org/show_bug.cgi?id=1562620
             this.initU2f = false;
         }
+        const isSafari = this.platformUtilsService.isSafari();
         await super.ngOnInit();
         if (this.selectedProviderType == null) {
             return;
         }
 
-        if (this.selectedProviderType === TwoFactorProviderType.Email &&
+        if (!isSafari && this.selectedProviderType === TwoFactorProviderType.Email &&
             this.popupUtilsService.inPopup(window)) {
             const confirmed = await this.platformUtilsService.showDialog(this.i18nService.t('popup2faCloseMessage'),
                 null, this.i18nService.t('yes'), this.i18nService.t('no'));

src/popup/app-routing.animations.ts

@@ -185,6 +185,8 @@ export const routerTransition = trigger('routerTransition', [
 
     transition('tabs => premium', inSlideLeft),
     transition('premium => tabs', outSlideRight),
-
-    transition('tabs => lock', inSlideDown),
 ]);
+
+if (!BrowserApi.isSafariApi) {
+    routerTransition.definitions.push(transition('tabs => lock', inSlideDown));
+}

src/popup/components/pop-out.component.html

@@ -1,4 +1,4 @@
-<ng-container>
+<ng-container *ngIf="show">
     <button (click)="expand()" appA11yTitle="{{'popOutNewWindow' | i18n}}">
         <i class="fa fa-external-link fa-rotate-270 fa-lg fa-fw" aria-hidden="true"></i>
     </button>

src/popup/components/pop-out.component.ts

@@ -22,7 +22,8 @@ export class PopOutComponent implements OnInit {
 
     ngOnInit() {
         if (this.show) {
-            if (this.popupUtilsService.inSidebar(window) && this.platformUtilsService.isFirefox()) {
+            this.show = !this.platformUtilsService.isSafari();
+            if (this.show && this.popupUtilsService.inSidebar(window) && this.platformUtilsService.isFirefox()) {
                 this.show = false;
             }
         }

src/popup/services/popup-utils.service.ts

@@ -68,6 +68,8 @@ export class PopupUtilsService {
             chrome.tabs.create({
                 url: href,
             });
+        } else if ((typeof safari !== 'undefined')) {
+            // Safari can't open popup in full page tab :(
         }
     }
 }

src/popup/settings/options.component.html

@@ -96,7 +96,7 @@
         </div>
         <div class="box-footer">{{'disableChangedPasswordNotificationDesc' | i18n}}</div>
     </div>
-    <div class="box">
+    <div class="box" *ngIf="showDisableContextMenu">
         <div class="box-content">
             <div class="box-content-row box-content-row-checkbox" appBoxRow>
                 <label for="context-menu">{{'disableContextMenuItem' | i18n}}</label>

src/popup/settings/options.component.ts

@@ -29,6 +29,7 @@ export class OptionsComponent implements OnInit {
     disableChangedPasswordNotification = false;
     dontShowCards = false;
     dontShowIdentities = false;
+    showDisableContextMenu = true;
     showClearClipboard = true;
     theme: string;
     themeOptions: any[];
@@ -67,6 +68,8 @@ export class OptionsComponent implements OnInit {
     }
 
     async ngOnInit() {
+        this.showDisableContextMenu = !this.platformUtilsService.isSafari();
+
         this.enableAutoFillOnPageLoad = await this.storageService.get<boolean>(
             ConstantsService.enableAutoFillOnPageLoadKey);
 

src/popup/vault/current-tab.component.html

@@ -1,5 +1,5 @@
 <header>
-    <div class="left">
+    <div class="left" *ngIf="showLeftHeader">
         <app-pop-out [show]="!inSidebar"></app-pop-out>
         <button type="button" appBlurClick (click)="refresh()" appA11yTitle="{{'refresh' | i18n}}" *ngIf="inSidebar">
             <i class="fa fa-retweet fa-lg fa-fw" aria-hidden="true"></i>

src/popup/vault/current-tab.component.ts

@@ -49,6 +49,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
     hostname: string;
     searchText: string;
     inSidebar = false;
+    showLeftHeader = false;
     searchTypeSearch = false;
     loaded = false;
 
@@ -67,7 +68,7 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
     }
 
     async ngOnInit() {
-        this.searchTypeSearch = !this.platformUtilsService.isSafari();
+        this.showLeftHeader = this.searchTypeSearch = !this.platformUtilsService.isSafari();
         this.inSidebar = this.popupUtilsService.inSidebar(window);
 
         this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {

src/popup/vault/groupings.component.html

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

src/popup/vault/groupings.component.ts

@@ -92,7 +92,8 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
 
     async ngOnInit() {
         this.searchTypeSearch = !this.platformUtilsService.isSafari();
-        this.showLeftHeader = !(this.popupUtils.inSidebar(window) && this.platformUtilsService.isFirefox());
+        this.showLeftHeader = !this.platformUtilsService.isSafari() &&
+            !(this.popupUtils.inSidebar(window) && this.platformUtilsService.isFirefox());
         this.stateService.remove('CiphersComponent');
 
         this.broadcasterService.subscribe(ComponentId, (message: any) => {