Consistency, macOS compatability

Author: greyivy

special-pages/pages/new-tab/app/favorites/integration-tests/favorites.page.js

@@ -20,8 +20,10 @@ export class FavoritesPage {
 
     async opensInNewTab() {
         await this.nthFavorite(0).click({ modifiers: ['Meta'] });
+        await this.nthFavorite(0).click({ button: 'middle' });
         const calls = await this.ntp.mocks.waitForCallCount({ method: 'favorites_open', count: 1 });
         expect(calls[0].payload.params).toStrictEqual({ id: 'id-many-1', url: 'https://example.com/?id=id-many-1', target: 'new-tab' });
+        expect(calls[1].payload.params).toStrictEqual({ id: 'id-many-1', url: 'https://example.com/?id=id-many-1', target: 'new-tab' });
     }
 
     async opensInNewWindow() {
@@ -32,16 +34,6 @@ export class FavoritesPage {
         expect(calls[1].payload.params).toStrictEqual({ id: 'id-many-1', url: 'https://example.com/?id=id-many-1', target: 'new-window' });
     }
 
-    async opensInBackgroundTab() {
-        await this.nthFavorite(0).click({ button: 'middle' });
-        const calls = await this.ntp.mocks.waitForCallCount({ method: 'favorites_open', count: 1 });
-        expect(calls[0].payload.params).toStrictEqual({
-            id: 'id-many-1',
-            url: 'https://example.com/?id=id-many-1',
-            target: 'background-tab',
-        });
-    }
-
     async opensInSameTab() {
         await this.nthFavorite(0).click();
         const calls = await this.ntp.mocks.waitForCallCount({ method: 'favorites_open', count: 1 });

special-pages/pages/new-tab/app/utils.js

@@ -73,10 +73,7 @@ export function eventToTarget(event, platformName) {
     } else if (event.shiftKey) {
         return 'new-window';
     } else if (event.button === 1 /* middle click */) {
-        if (platformName === 'windows') {
-            return 'background-tab';
-        }
-        return 'new-window';
+        return 'new-tab';
     }
     return 'same-tab';
 }

special-pages/pages/new-tab/messages/types/open-target.json

@@ -2,5 +2,5 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Open Target",
   "type": "string",
-  "enum": ["same-tab", "new-tab", "new-window", "background-tab"]
+  "enum": ["same-tab", "new-tab", "new-window"]
 }

special-pages/pages/new-tab/types/new-tab.ts

@@ -6,7 +6,7 @@
  * @module NewTab Messages
  */
 
-export type OpenTarget = "same-tab" | "new-tab" | "new-window" | "background-tab";
+export type OpenTarget = "same-tab" | "new-tab" | "new-window";
 /**
  * Represents the expansion state of a widget
  */

special-pages/shared/handlers.js

@@ -5,9 +5,9 @@
  */
 export function eventToTarget(event, platformName) {
     const isControlClick = platformName === 'macos' ? event.metaKey : event.ctrlKey;
-    if (isControlClick) {
+    if (isControlClick || ('button' in event && event.button === 1) /* middle click */) {
         return 'new-tab';
-    } else if (event.shiftKey || ('button' in event && event.button === 1) /* middle click */) {
+    } else if (event.shiftKey) {
         return 'new-window';
     }
     return 'same-tab';