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

Ensure the scroll location is retains in the query tool data grid if the user changes tab and then returns. Fixes #2875

pull/6/head
Murtuza Zabuawala 2017-11-23 09:07:46 +00:00 committed by Dave Page
parent 5f5c590ffd
commit 38f111d969
1 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
web/pgadmin/tools/sqleditor/static/js/sqleditor.js
View File

@ -917,7 +917,8 @@ define('tools.querytool', [
// fetch asynchronous
setTimeout(self.fetch_next.bind(self));
}
})
});
// Resize SlickGrid when window resize
$(window).resize(function () {
// Resize grid only when 'Data Output' panel is visible.
@ -1025,9 +1026,36 @@ define('tools.querytool', [
/* This function is responsible to render output grid */
grid_resize: function (grid) {
var h = $($('#editor-panel').find('.wcFrame')[1]).height() - 35;
$('#datagrid').css({'height': h + 'px'});
var prev_height = $('#datagrid').height(),
h = $($('#editor-panel').find('.wcFrame')[1]).height() - 35,
prev_viewport = grid.getViewport(),
prev_viewport_rows = grid.getRenderedRange(),
prev_cell = grid.getActiveCell();
// Apply css only if necessary, To avoid DOM operation
if (prev_height != h) {
$('#datagrid').css({'height': h + 'px'});
}
grid.resizeCanvas();
/*
* If there is an active cell from user then we have to go to that cell
*/
if(prev_cell) {
grid.scrollCellIntoView(prev_cell.row, prev_cell.cell);
}
// If already displaying from first row
if (prev_viewport.top == prev_viewport_rows.top) {
return
}
// if user has scroll to the end/last row
else if (prev_viewport.bottom - 2 == prev_viewport_rows.bottom) {
grid.scrollRowIntoView(prev_viewport.bottom);
} else {
grid.scrollRowIntoView(prev_viewport.bottom - 2);
}
},
/* This function is responsible to create and render the