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

Fix scrolling in the query tool editor. Fixes #1579

pull/3/head
Surinder Kumar 2016-09-15 10:14:51 +01:00 committed by Dave Page
parent c48e8d415b
commit 016de5dc88
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/templates/base.html
View File

@ -50,6 +50,8 @@
href="{{ url_for('static', filename='css/slickgrid/slick-default-theme.css')}}"/> href="{{ url_for('static', filename='css/slickgrid/slick-default-theme.css')}}"/>
<link type="text/css" rel="stylesheet" <link type="text/css" rel="stylesheet"
href="{{ url_for('static', filename='css/slickgrid/smoothness/jquery-ui-1.11.3.custom.css' if config.DEBUG else 'css/slickgrid/smoothness/jquery-ui-1.11.3.custom.min.css')}}"/> href="{{ url_for('static', filename='css/slickgrid/smoothness/jquery-ui-1.11.3.custom.css' if config.DEBUG else 'css/slickgrid/smoothness/jquery-ui-1.11.3.custom.min.css')}}"/>
<link type="text/css" rel="stylesheet"
href="{{ url_for('static', filename='js/codemirror/addon/scroll/simplescrollbars.css')}}"/>
<!-- View specified stylesheets --> <!-- View specified stylesheets -->
{% for stylesheet in current_app.stylesheets %} {% for stylesheet in current_app.stylesheets %}

12
web/pgadmin/tools/sqleditor/static/css/sqleditor.css
View File

@ -156,6 +156,18 @@
min-height: 100%; min-height: 100%;
} }
/* Changes specific to output panel of query tool */
#output-panel, #output-panel .CodeMirror, #output-panel .CodeMirror-gutters {
height: 100% !important;
}
#output-panel .CodeMirror-gutter-wrapper {
width: 43px;
height: 22px;
border-right: 1px solid #ddd !important;
background: #f7f7f7 !important;
}
.CodeMirror-foldgutter { .CodeMirror-foldgutter {
width: .9em; width: .9em;
} }

11
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@ -7,7 +7,7 @@ define(
'codemirror/addon/selection/active-line', 'codemirror/addon/selection/active-line',
'codemirror/addon/fold/foldgutter', 'codemirror/addon/fold/foldcode', 'codemirror/addon/fold/foldgutter', 'codemirror/addon/fold/foldcode',
'codemirror/addon/hint/show-hint', 'codemirror/addon/hint/sql-hint', 'codemirror/addon/hint/show-hint', 'codemirror/addon/hint/sql-hint',
'codemirror/addon/fold/pgadmin-sqlfoldcode', 'codemirror/addon/fold/pgadmin-sqlfoldcode','codemirror/addon/scroll/simplescrollbars',
'backgrid.sizeable.columns', 'wcdocker', 'pgadmin.file_manager' 'backgrid.sizeable.columns', 'wcdocker', 'pgadmin.file_manager'
], ],
function( function(
@ -191,9 +191,9 @@ define(
sql_panel.load(main_docker); sql_panel.load(main_docker);
var sql_panel_obj = main_docker.addPanel('sql_panel', wcDocker.DOCK.TOP); var sql_panel_obj = main_docker.addPanel('sql_panel', wcDocker.DOCK.TOP);
var output_container = $('<div id="output-panel"></div>'); var text_container = $('<textarea id="sql_query_tool"></textarea>');
var text_container = $('<textarea id="sql_query_tool"></textarea>').append(output_container); var output_container = $('<div id="output-panel"></div>').append(text_container);
sql_panel_obj.layout().addItem(text_container); sql_panel_obj.$container.find('.pg-panel-content').append(output_container);
self.query_tool_obj = CodeMirror.fromTextArea(text_container.get(0), { self.query_tool_obj = CodeMirror.fromTextArea(text_container.get(0), {
lineNumbers: true, lineNumbers: true,
@ -210,7 +210,8 @@ define(
}, },
gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"], gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"],
extraKeys: pgBrowser.editor_shortcut_keys, extraKeys: pgBrowser.editor_shortcut_keys,
tabSize: pgAdmin.Browser.editor_options.tabSize tabSize: pgAdmin.Browser.editor_options.tabSize,
scrollbarStyle: 'simple'
}); });
// Create panels for 'Data Output', 'Explain', 'Messages' and 'History' // Create panels for 'Data Output', 'Explain', 'Messages' and 'History'