|
@@ -1398,7 +1398,7 @@ function reinitializeTable(max) {
|
|
|
heightAfterCorrection: 0
|
|
heightAfterCorrection: 0
|
|
|
});
|
|
});
|
|
|
reinitializeTableExtenders();
|
|
reinitializeTableExtenders();
|
|
|
- container.height($("#results .dataTables_wrapper").height());
|
|
|
|
|
|
|
+ container.height($(window).height() - 150);
|
|
|
$("#results .dataTables_wrapper").jHueScrollUp();
|
|
$("#results .dataTables_wrapper").jHueScrollUp();
|
|
|
} else if ($('#resultEmpty').height() > 0) {
|
|
} else if ($('#resultEmpty').height() > 0) {
|
|
|
container.height($('#resultEmpty').height());
|
|
container.height($('#resultEmpty').height());
|
|
@@ -2017,6 +2017,8 @@ function datatableScroll() {
|
|
|
|
|
|
|
|
var firstFnDrawcallback = false;
|
|
var firstFnDrawcallback = false;
|
|
|
|
|
|
|
|
|
|
+var manualFetchResultCounter = 0;
|
|
|
|
|
+
|
|
|
function addResults(viewModel, dataTable, startRow, nextRow) {
|
|
function addResults(viewModel, dataTable, startRow, nextRow) {
|
|
|
if (startRow == 0) {
|
|
if (startRow == 0) {
|
|
|
firstFnDrawcallback = true;
|
|
firstFnDrawcallback = true;
|
|
@@ -2024,9 +2026,13 @@ function addResults(viewModel, dataTable, startRow, nextRow) {
|
|
|
dataTable.fnAddData(addRowNumberToResults(viewModel.design.results.rows.slice(startRow, nextRow), startRow));
|
|
dataTable.fnAddData(addRowNumberToResults(viewModel.design.results.rows.slice(startRow, nextRow), startRow));
|
|
|
|
|
|
|
|
% if app_name == 'impala':
|
|
% if app_name == 'impala':
|
|
|
- if (startRow == 0 && viewModel.scrollNotWorking() && viewModel.hasMoreResults()){
|
|
|
|
|
|
|
+ manualFetchResultCounter += (nextRow - startRow);
|
|
|
|
|
+ if (manualFetchResultCounter < 100 && viewModel.scrollNotWorking() && viewModel.hasMoreResults()){
|
|
|
manualFetch();
|
|
manualFetch();
|
|
|
}
|
|
}
|
|
|
|
|
+ else {
|
|
|
|
|
+ manualFetchResultCounter = 0;
|
|
|
|
|
+ }
|
|
|
%endif
|
|
%endif
|
|
|
}
|
|
}
|
|
|
|
|
|