|
@@ -1051,6 +1051,7 @@ $(document).ready(function () {
|
|
|
|
|
|
|
|
renderRecent = function() {
|
|
renderRecent = function() {
|
|
|
$("#recentLoader").show();
|
|
$("#recentLoader").show();
|
|
|
|
|
+ $("#recentQueries").hide();
|
|
|
recentQueries.fnClearTable();
|
|
recentQueries.fnClearTable();
|
|
|
$.getJSON("${ url(app_name + ':list_query_history') }?format=json", function(data) {
|
|
$.getJSON("${ url(app_name + ':list_query_history') }?format=json", function(data) {
|
|
|
if (data && data.queries) {
|
|
if (data && data.queries) {
|
|
@@ -1067,7 +1068,7 @@ $(document).ready(function () {
|
|
|
}
|
|
}
|
|
|
$("a[data-row-selector='true']").jHueRowSelector();
|
|
$("a[data-row-selector='true']").jHueRowSelector();
|
|
|
$("#recentLoader").hide();
|
|
$("#recentLoader").hide();
|
|
|
- $("#recentQueries").css("width", "100%");
|
|
|
|
|
|
|
+ $("#recentQueries").show().css("width", "100%");
|
|
|
reinitializeTableExtenders();
|
|
reinitializeTableExtenders();
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
@@ -1953,8 +1954,8 @@ function addResults(viewModel, dataTable, index, pageSize) {
|
|
|
if (viewModel.hasMoreResults() && index + pageSize > viewModel.design.results.rows().length) {
|
|
if (viewModel.hasMoreResults() && index + pageSize > viewModel.design.results.rows().length) {
|
|
|
$(document).one('fetched.results', function () {
|
|
$(document).one('fetched.results', function () {
|
|
|
$.totalStorage(hac_getTotalStorageUserPrefix() + "${app_name}_temp_query", null);
|
|
$.totalStorage(hac_getTotalStorageUserPrefix() + "${app_name}_temp_query", null);
|
|
|
- dataTable.fnAddData(addRowNumberToResults(viewModel.design.results.rows.slice(index, index + pageSize), index));
|
|
|
|
|
});
|
|
});
|
|
|
|
|
+ dataTable.fnAddData(addRowNumberToResults(viewModel.design.results.rows.slice(index, index + pageSize), index));
|
|
|
viewModel.fetchResults();
|
|
viewModel.fetchResults();
|
|
|
} else {
|
|
} else {
|
|
|
dataTable.fnAddData(addRowNumberToResults(viewModel.design.results.rows.slice(index, index + pageSize), index));
|
|
dataTable.fnAddData(addRowNumberToResults(viewModel.design.results.rows.slice(index, index + pageSize), index));
|
|
@@ -2577,10 +2578,16 @@ function watchEvents() {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function cacheQueryTextEvents() {
|
|
function cacheQueryTextEvents() {
|
|
|
- codeMirror.on("change", function () {
|
|
|
|
|
- $(".query").val(codeMirror.getValue());
|
|
|
|
|
- $.totalStorage(hac_getTotalStorageUserPrefix() + "${app_name}_temp_query", codeMirror.getValue());
|
|
|
|
|
- });
|
|
|
|
|
|
|
+ var _waitForCodemirrorInit = -1;
|
|
|
|
|
+ _waitForCodemirrorInit = window.setInterval(function () {
|
|
|
|
|
+ if (typeof codeMirror != "undefined") {
|
|
|
|
|
+ codeMirror.on("change", function () {
|
|
|
|
|
+ $(".query").val(codeMirror.getValue());
|
|
|
|
|
+ $.totalStorage(hac_getTotalStorageUserPrefix() + "${app_name}_temp_query", codeMirror.getValue());
|
|
|
|
|
+ });
|
|
|
|
|
+ window.clearInterval(_waitForCodemirrorInit);
|
|
|
|
|
+ }
|
|
|
|
|
+ }, 100);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
function getDatabases(callback){
|
|
function getDatabases(callback){
|