Skip to content

Commit 601ea43

Browse files
authored
issue reporter refactor cleanup (#212932)
* remove comments and fix new key usages * cleanup
1 parent 11c70a6 commit 601ea43

File tree

3 files changed

+9
-27
lines changed

3 files changed

+9
-27
lines changed

src/vs/code/browser/issue/issue.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -835,10 +835,6 @@ export class BaseIssueReporterService extends Disposable {
835835
return false;
836836
}
837837
const result = await response.json();
838-
// if (this.nativeHostService) {
839-
// await this.nativeHostService.openExternal(result.html_url);
840-
// }
841-
842838
this.window.open(result.html_url, '_blank');
843839

844840
this.close();
@@ -853,10 +849,6 @@ export class BaseIssueReporterService extends Disposable {
853849
const url = this.getExtensionBugsUrl();
854850
if (url) {
855851
this.hasBeenSubmitted = true;
856-
// if (this.nativeHostService) {
857-
// await this.nativeHostService.openExternal(url);
858-
// }
859-
860852
return true;
861853
}
862854
}

src/vs/code/browser/issue/issueReporterService.ts

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,15 @@ export class IssueWebReporter extends BaseIssueReporterService {
7676

7777
this.addEventListener('disableExtensions', 'keydown', (e: Event) => {
7878
e.stopPropagation();
79-
if ((e as KeyboardEvent).key === "Enter" || (e as KeyboardEvent).key === " ") {
79+
if ((e as KeyboardEvent).key === 'Enter' || (e as KeyboardEvent).key === ' ') {
8080
this.issueMainService.$reloadWithExtensionsDisabled();
8181
}
8282
});
8383

8484
this.window.document.onkeydown = async (e: KeyboardEvent) => {
8585
const cmdOrCtrlKey = isMacintosh ? e.metaKey : e.ctrlKey;
8686
// Cmd/Ctrl+Enter previews issue and closes window
87-
if (cmdOrCtrlKey && e.key === "Enter") {
87+
if (cmdOrCtrlKey && e.key === 'Enter') {
8888
this.delayedSubmit.trigger(async () => {
8989
if (await this.createIssue()) {
9090
this.close();
@@ -93,7 +93,7 @@ export class IssueWebReporter extends BaseIssueReporterService {
9393
}
9494

9595
// Cmd/Ctrl + w closes issue window
96-
if (cmdOrCtrlKey && e.key === "w") {
96+
if (cmdOrCtrlKey && e.key === 'w') {
9797
e.stopPropagation();
9898
e.preventDefault();
9999

@@ -107,20 +107,10 @@ export class IssueWebReporter extends BaseIssueReporterService {
107107
}
108108
}
109109

110-
// Cmd/Ctrl + zooms in
111-
if (cmdOrCtrlKey && e.key === "+") {
112-
// zoomIn(this.window);
113-
}
114-
115-
// Cmd/Ctrl - zooms out
116-
if (cmdOrCtrlKey && e.key === "-") {
117-
// zoomOut(this.window);
118-
}
119-
120110
// With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac
121111
// Manually perform the selection
122112
if (isMacintosh) {
123-
if (cmdOrCtrlKey && e.key === "a" && e.target) {
113+
if (cmdOrCtrlKey && e.key === 'a' && e.target) {
124114
if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) {
125115
(<HTMLInputElement>e.target).select();
126116
}

src/vs/code/electron-sandbox/issue/issueReporterService2.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ export class IssueReporter2 extends BaseIssueReporterService {
109109
mainWindow.document.onkeydown = async (e: KeyboardEvent) => {
110110
const cmdOrCtrlKey = isMacintosh ? e.metaKey : e.ctrlKey;
111111
// Cmd/Ctrl+Enter previews issue and closes window
112-
if (cmdOrCtrlKey && e.key === "Enter") {
112+
if (cmdOrCtrlKey && e.key === 'Enter') {
113113
this.delayedSubmit.trigger(async () => {
114114
if (await this.createIssue()) {
115115
this.close();
@@ -118,7 +118,7 @@ export class IssueReporter2 extends BaseIssueReporterService {
118118
}
119119

120120
// Cmd/Ctrl + w closes issue window
121-
if (cmdOrCtrlKey && e.key === "w") {
121+
if (cmdOrCtrlKey && e.key === 'w') {
122122
e.stopPropagation();
123123
e.preventDefault();
124124

@@ -133,19 +133,19 @@ export class IssueReporter2 extends BaseIssueReporterService {
133133
}
134134

135135
// Cmd/Ctrl + zooms in
136-
if (cmdOrCtrlKey && e.key === "+") {
136+
if (cmdOrCtrlKey && (e.key === '+' || e.key === '=')) {
137137
zoomIn(mainWindow);
138138
}
139139

140140
// Cmd/Ctrl - zooms out
141-
if (cmdOrCtrlKey && e.key === "-") {
141+
if (cmdOrCtrlKey && e.key === '-') {
142142
zoomOut(mainWindow);
143143
}
144144

145145
// With latest electron upgrade, cmd+a is no longer propagating correctly for inputs in this window on mac
146146
// Manually perform the selection
147147
if (isMacintosh) {
148-
if (cmdOrCtrlKey && e.key === "a" && e.target) {
148+
if (cmdOrCtrlKey && e.key === 'a' && e.target) {
149149
if (e.target instanceof HTMLInputElement || e.target instanceof HTMLTextAreaElement) {
150150
(<HTMLInputElement>e.target).select();
151151
}

0 commit comments

Comments
 (0)