Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 22:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Issue Reporter: Change keys to submit and close to Cmd+Enter on Mac, Ctrl+Enter on Win/Linux

Browse Source
This commit is contained in:
Rachel Macfarlane
2018-01-26 14:46:47 -08:00
parent 954b78e4e2
commit 1b57be2aaa
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/vs/code/electron-browser/issue/issueReporterMain.ts
View File

@@ -34,6 +34,7 @@ import { IssueReporterData, IssueReporterStyles } from 'vs/platform/issue/common
import BaseHtml from 'vs/code/electron-browser/issue/issueReporterPage';
import { ILocalExtension } from 'vs/platform/extensionManagement/common/extensionManagement';
import { debounce } from 'vs/base/common/decorators';
import * as platform from 'vs/base/common/platform';
export interface IssueReporterConfiguration extends IWindowConfiguration {
data: IssueReporterData;
@@ -42,12 +43,8 @@ export interface IssueReporterConfiguration extends IWindowConfiguration {
export function startup(configuration: IssueReporterConfiguration) {
document.body.innerHTML = BaseHtml();
const issueReporter = new IssueReporter(configuration);
// workaround for flickering on page load as css is applied
setTimeout(() => {
issueReporter.render();
document.body.style.display = 'block';
}, 10);
issueReporter.render();
document.body.style.display = 'block';
}
export class IssueReporter extends Disposable {
@@ -235,14 +232,27 @@ export class IssueReporter extends Disposable {
ipcRenderer.send('workbenchCommand', 'workbench.action.showRuntimeExtensions');
});
document.onkeydown = (e: KeyboardEvent) => {
if (e.shiftKey && e.keyCode === 13) {
// Close the window if the issue was successfully created
if (this.createIssue()) {
remote.getCurrentWindow().close();
// Cmd+Enter or Mac or Ctrl+Enter on other platforms previews issue and closes window
if (platform.isMacintosh) {
let prevKeyWasCommand = false;
document.onkeydown = (e: KeyboardEvent) => {
if (prevKeyWasCommand && e.keyCode === 13) {
if (this.createIssue()) {
remote.getCurrentWindow().close();
}
}
}
};
prevKeyWasCommand = e.keyCode === 91 || e.keyCode === 93;
};
} else {
document.onkeydown = (e: KeyboardEvent) => {
if (e.ctrlKey && e.keyCode === 13) {
if (this.createIssue()) {
remote.getCurrentWindow().close();
}
}
};
}
}
@debounce(300)
@@ -277,7 +287,14 @@ export class IssueReporter extends Disposable {
}
});
}).catch((error) => {
// TODO: Use LogService here.
console.log(error);
/* __GDPR__
"issueReporterSearchError" : {
"message" : { "classification": "SystemMetaData", "purpose": "PerformanceAndHealth" }
}
*/
this.telemetryService.publicLog('issueReporterSearchError', { message: error.message });
});
} else {
similarIssues.innerHTML = '';