Skip to content

Commit 3754487

Browse files
committed
aux window - enable reload window
1 parent 6bda74d commit 3754487

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

src/vs/platform/auxiliaryWindow/electron-main/auxiliaryWindow.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ export class AuxiliaryWindow extends BaseWindow implements IAuxiliaryWindow {
3939
) {
4040
super(configurationService, stateService, environmentMainService);
4141

42-
contents.removeAllListeners('devtools-reload-page'); // remove built in listener as aux windows have no reload
43-
4442
// Try to claim window
4543
this.tryClaimWindow();
4644
}

src/vs/workbench/browser/actions/windowActions.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { IWindowOpenable } from 'vs/platform/window/common/window';
88
import { IDialogService } from 'vs/platform/dialogs/common/dialogs';
99
import { MenuRegistry, MenuId, Action2, registerAction2, IAction2Options } from 'vs/platform/actions/common/actions';
1010
import { KeyChord, KeyCode, KeyMod } from 'vs/base/common/keyCodes';
11-
import { IsAuxiliaryWindowFocusedContext, IsMainWindowFullscreenContext } from 'vs/workbench/common/contextkeys';
11+
import { IsMainWindowFullscreenContext } from 'vs/workbench/common/contextkeys';
1212
import { IsMacNativeContext, IsDevelopmentContext, IsWebContext, IsIOSContext } from 'vs/platform/contextkey/common/contextkeys';
1313
import { Categories } from 'vs/platform/action/common/actionCommonCategories';
1414
import { KeybindingsRegistry, KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
@@ -35,7 +35,6 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
3535
import { ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
3636
import { isFolderBackupInfo, isWorkspaceBackupInfo } from 'vs/platform/backup/common/backup';
3737
import { getActiveElement, getActiveWindow } from 'vs/base/browser/dom';
38-
import { mainWindow } from 'vs/base/browser/window';
3938

4039
export const inRecentFilesPickerContextKey = 'inRecentFilesPicker';
4140

@@ -323,7 +322,6 @@ export class ReloadWindowAction extends Action2 {
323322
id: ReloadWindowAction.ID,
324323
title: { value: localize('reloadWindow', "Reload Window"), original: 'Reload Window' },
325324
category: Categories.Developer,
326-
precondition: IsAuxiliaryWindowFocusedContext.toNegated(),
327325
f1: true,
328326
keybinding: {
329327
weight: KeybindingWeight.WorkbenchContrib + 50,
@@ -336,9 +334,7 @@ export class ReloadWindowAction extends Action2 {
336334
override async run(accessor: ServicesAccessor): Promise<void> {
337335
const hostService = accessor.get(IHostService);
338336

339-
if (getActiveWindow() === mainWindow) {
340-
return hostService.reload(); // only supported for main window
341-
}
337+
return hostService.reload();
342338
}
343339
}
344340

0 commit comments

Comments
 (0)