Skip to content

ntp: send background-tab on windows middle-click #1595

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mgurgel merged 7 commits into from
Apr 3, 2025
Merged

ntp: send background-tab on windows middle-click #1595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3686248
ntp: send background-tab on windows middle-click
shakyShane Mar 28, 2025
8dd03fa
Consistency, macOS compatability
greyivy Mar 28, 2025
ce0ef5f
Remove unused test
greyivy Mar 28, 2025
0a95d44
Fix test
greyivy Mar 28, 2025
66c69c0
Fix test
greyivy Mar 28, 2025
ef49f41
(Sorry, I can't run integration tests locally)
greyivy Mar 28, 2025
22fa7a4
Last fix
greyivy Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion special-pages/pages/history/integration-tests/history.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ export class HistoryTestPage {

expect(calls[3].payload.params).toStrictEqual({
url,
target: 'new-window',
target: 'new-tab',
});
}

Expand Down
2 changes: 1 addition & 1 deletion special-pages/pages/new-tab/app/activity/integration-tests/activity.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ export class ActivityPage {

expect(calls[3].payload.params).toStrictEqual({
url,
target: 'new-window',
target: 'new-tab',
});
}

Expand Down
6 changes: 3 additions & 3 deletions special-pages/pages/new-tab/app/favorites/integration-tests/favorites.page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@ 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() {
await this.nthFavorite(0).click({ modifiers: ['Shift'] });
await this.nthFavorite(0).click({ button: 'middle' });
const calls = await this.ntp.mocks.waitForCallCount({ method: 'favorites_open', count: 2 });
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-window' });
expect(calls[1].payload.params).toStrictEqual({ id: 'id-many-1', url: 'https://example.com/?id=id-many-1', target: 'new-window' });
}

async opensInSameTab() {
Expand Down
4 changes: 3 additions & 1 deletion special-pages/pages/new-tab/app/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,10 @@ export function eventToTarget(event, platformName) {
const isControlClick = platformName === 'macos' ? event.metaKey : event.ctrlKey;
if (isControlClick) {
return 'new-tab';
} else if (event.shiftKey || event.button === 1 /* middle click */) {
} else if (event.shiftKey) {
return 'new-window';
} else if (event.button === 1 /* middle click */) {
return 'new-tab';
}
return 'same-tab';
}
Expand Down
4 changes: 2 additions & 2 deletions special-pages/shared/handlers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
Loading