Skip to content

Commit 6e222b0

Browse files
committed
Fix the "Developer tools" menu item
1 parent cb03885 commit 6e222b0

File tree

2 files changed

+9
-8
lines changed

2 files changed

+9
-8
lines changed

extraterm/src/render_process/MainWeb.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -447,9 +447,7 @@ function startUpSessions(configDatabase: ConfigDatabaseImpl, extensionManager: E
447447
let developerToolMenuChecked = false;
448448

449449
function commandToggleDeveloperTools(): void {
450-
const developerToolMenu = <CheckboxMenuItem> document.getElementById("developer_tools");
451-
WebIpc.devToolsRequest(developerToolMenu.checked);
452-
developerToolMenuChecked = ! developerToolMenuChecked;
450+
WebIpc.devToolsRequest( ! developerToolMenuChecked);
453451
}
454452

455453
function customizeToggleDeveloperTools(): CustomizedCommand {
@@ -520,11 +518,8 @@ function handleThemeContentsMessage(msg: Messages.Message): void {
520518

521519
function handleDevToolsStatus(msg: Messages.Message): void {
522520
const devToolsStatusMessage = <Messages.DevToolsStatusMessage> msg;
523-
const developerToolMenu = <CheckboxMenuItem> document.getElementById("developer_tools");
524-
if (developerToolMenu === null) {
525-
return;
526-
}
527-
developerToolMenu.checked = devToolsStatusMessage.open;
521+
developerToolMenuChecked = devToolsStatusMessage.open;
522+
applicationContextMenu.render();
528523
}
529524

530525
function handleClipboardRead(msg: Messages.Message): void {

extraterm/src/render_process/command/ApplicationContextMenu.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export class ApplicationContextMenu {
3838
private _contextMenuElement: ContextMenu = null
3939
private _menuEntries: CommandAndShortcut[] = null;
4040
private _contextWindowState : CommonExtensionWindowState = null;
41+
private _menuType = ContextMenuType.NORMAL;
4142

4243
constructor(private extensionManager: ExtensionManager, private keybindingsManager: KeybindingsManager) {
4344
this._log = getLogger("ApplicationContextMenu", this);
@@ -85,12 +86,17 @@ export class ApplicationContextMenu {
8586
}
8687

8788
openAround(el: HTMLElement, menuType: ContextMenuType): void {
89+
this._menuType = menuType;
8890
doLater( () => {
8991
this._updateMenu(menuType);
9092
this._contextMenuElement.openAround(el);
9193
});
9294
}
9395

96+
render(): void {
97+
this._updateMenu(this._menuType);
98+
}
99+
94100
private _updateMenu(menuType: ContextMenuType): void {
95101
const options: CommandQueryOptions = {
96102
when: true

0 commit comments

Comments
 (0)