pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove the duplicate code for tab indent and add the logic into codemirror.

pull/33/head
Nikhil Mohite 2020-07-03 10:47:39 +05:30 committed by Akshay Joshi
parent ec30e6ace7
commit 2ec8051303
4 changed files with 18 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/pgadmin/static/bundle/codemirror.js
View File

@ -36,6 +36,23 @@ cmds.focusOut = function(){
} }
}; };
CodeMirror.keyMap.default['Esc'] = 'focusOut'; CodeMirror.defineInitHook(function (codeMirror) {
codeMirror.addKeyMap({
Tab: function (cm) {
if(cm.somethingSelected()){
cm.execCommand('indentMore');
}
else {
if (cm.getOption('indentWithTabs')) {
cm.replaceSelection('\t', 'end', '+input');
}
else {
cm.execCommand('insertSoftTab');
}
}
},
});
});
CodeMirror.keyMap.default['Esc'] = 'focusOut';
export default CodeMirror; export default CodeMirror;

16
web/pgadmin/static/js/backform.pgadmin.js
View File

@ -2527,22 +2527,6 @@ define([
self.sqlCtrl.setOption('lineWrapping', sqlEditPreferences.wrap_code); self.sqlCtrl.setOption('lineWrapping', sqlEditPreferences.wrap_code);
self.sqlCtrl.setOption('autoCloseBrackets', sqlEditPreferences.insert_pair_brackets); self.sqlCtrl.setOption('autoCloseBrackets', sqlEditPreferences.insert_pair_brackets);
self.sqlCtrl.setOption('matchBrackets', sqlEditPreferences.brace_matching); self.sqlCtrl.setOption('matchBrackets', sqlEditPreferences.brace_matching);
// Added extra logic to handel tab indent and use space setting.
self.sqlCtrl.setOption('extraKeys', {
Tab: (cm) => {
if(cm.somethingSelected()){
cm.execCommand('indentMore');
} else {
if (!sqlEditPreferences.use_spaces) {
cm.replaceSelection('\t', 'end', '+input');
}
else {
cm.execCommand('insertSoftTab');
}
}
},
'Shift-Tab': (cm) => cm.execCommand('indentLess'),
});
setTimeout(function() { setTimeout(function() {
if (self.sqlCtrl) self.sqlCtrl.refresh(); if (self.sqlCtrl) self.sqlCtrl.refresh();
}, 500); }, 500);

16
web/pgadmin/static/js/sqleditor/query_tool_preferences.js
View File

@ -224,22 +224,6 @@ function updateUIPreferences(sqlEditor) {
sqlEditor.query_tool_obj.setOption('lineWrapping', preferences.wrap_code); sqlEditor.query_tool_obj.setOption('lineWrapping', preferences.wrap_code);
sqlEditor.query_tool_obj.setOption('autoCloseBrackets', preferences.insert_pair_brackets); sqlEditor.query_tool_obj.setOption('autoCloseBrackets', preferences.insert_pair_brackets);
sqlEditor.query_tool_obj.setOption('matchBrackets', preferences.brace_matching); sqlEditor.query_tool_obj.setOption('matchBrackets', preferences.brace_matching);
// Added extra logic to handel tab indent and use space setting.
sqlEditor.query_tool_obj.setOption('extraKeys', {
Tab: (cm) => {
if(cm.somethingSelected()){
cm.execCommand('indentMore');
} else {
if (!preferences.use_spaces) {
cm.replaceSelection('\t', 'end', '+input');
}
else {
cm.execCommand('insertSoftTab');
}
}
},
'Shift-Tab': (cm) => cm.execCommand('indentLess'),
});
sqlEditor.query_tool_obj.refresh(); sqlEditor.query_tool_obj.refresh();
/* Render history to reflect Font size change */ /* Render history to reflect Font size change */

16
web/pgadmin/tools/datagrid/static/js/show_data.js
View File

@ -200,22 +200,6 @@ function initFilterDialog(alertify, pgBrowser) {
$(this.filter_obj.getWrapperElement()).css('font-size', sql_font_size); $(this.filter_obj.getWrapperElement()).css('font-size', sql_font_size);
setTimeout(function() { setTimeout(function() {
// Added extra logic to handel tab indent and use space setting.
that.filter_obj.setOption('extraKeys', {
Tab: (cm) => {
if(cm.somethingSelected()){
cm.execCommand('indentMore');
} else {
if (!that.preferences.use_spaces) {
cm.replaceSelection('\t', 'end', '+input');
}
else {
cm.execCommand('insertSoftTab');
}
}
},
'Shift-Tab': (cm) => cm.execCommand('indentLess'),
});
// Set focus on editor // Set focus on editor
that.filter_obj.refresh(); that.filter_obj.refresh();
that.filter_obj.focus(); that.filter_obj.focus();