IntenseWebs/pgadmin4
3
0 Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-10-25 22:20:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Added SQL Formatter support in Query Tool. Fixes #2042

Browse Source
This commit is contained in:
Dave Page authored and Akshay Joshi committed 2020-08-20 13:05:00 +05:30
1 parent cc5a7ea334
commit 79e6480513
12 files changed
+460 -212
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

web/pgadmin/static/js/keyboard_shortcuts.js
+8 -1
View File
@@ -17,7 +17,8 @@ const PERIOD_KEY = 190,
LEFT_KEY = 37,
UP_KEY = 38,
RIGHT_KEY = 39,
DOWN_KEY = 40;
DOWN_KEY = 40,
K_KEY = 75;
function isMac() {
return window.navigator.platform.search('Mac') != -1;
@@ -247,6 +248,12 @@ function keyboardShortcutsQueryTool(
) && keyCode === PERIOD_KEY) {
this._stopEventPropagation(event);
queryToolActions.uncommentLineCode(sqlEditorController);
} else if ((
(this.isMac() && event.metaKey) ||
(!this.isMac() && event.ctrlKey)
) && !event.altKey && event.shiftKey && keyCode === K_KEY) {
this._stopEventPropagation(event);
queryToolActions.formatSql(sqlEditorController);
} else if (keyCode == ESC_KEY) {
queryToolActions.focusOut(sqlEditorController);
/*Apply only for sub-dropdown*/
web/pgadmin/static/js/sqleditor/query_tool_actions.js
+4
View File
@@ -123,6 +123,10 @@ let queryToolActions = {
);
},
formatSql: function (sqlEditorController) {
sqlEditorController.gridView.on_format_sql();
},
focusOut: function () {
document.activeElement.blur();
pgWindow.document.activeElement.blur();