From fa4f0ba60589060a9c27151cc89cf2a98c1abd62 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 10 Jan 2017 10:51:57 +0000
Subject: [PATCH] SSDM-4552 : Extra changes to sample tables loading to make
them feel faster
SVN: 37574
---
.../html/js/views/DataGrid/SampleDataGridUtil.js | 1 -
.../html/js/views/SampleTable/SampleTableController.js | 2 +-
.../1/as/webapps/eln-lims/html/lib/grid/js/Grid.js | 9 +++++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 52682e37221..27459254beb 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -287,7 +287,6 @@ var SampleDataGridUtil = new function() {
objects : dataList,
totalCount : result.totalCount
});
- Util.unblockUI();
}
var fetchOptions = {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
index c2c37055071..e45bd922413 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleTable/SampleTableController.js
@@ -25,7 +25,7 @@ function SampleTableController(parentController, title, experimentIdentifier, pr
var callback = function() {
_this._sampleTableView.repaint($container);
- //Util.unblockUI();
+ Util.unblockUI();
};
if(this._sampleTableModel.experimentIdentifier || projectPermId) {
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js
index 093996651b0..d7cda39f46d 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/lib/grid/js/Grid.js
@@ -570,7 +570,7 @@ $.extend(Grid.prototype, {
if(thisGrid.firstLoad) {
$(thisGrid.panel).hide();
- thisGrid.firstLoad = false;
+ Util.blockUI();
}
thisGrid.getDataList(function(dataListResult) {
@@ -683,7 +683,12 @@ $.extend(Grid.prototype, {
//HACK: Legacy Hacks no longer needed
$(window).trigger('resize'); // HACK: Fixes table rendering issues when refreshing the grid on fuelux 3.1.0 for all browsers
- $(thisGrid.panel).show(0); // HACK: Fixes Chrome rendering issues when refreshing the grid on fuelux 3.1.0
+ if(thisGrid.firstLoad) {
+ Util.unblockUI();
+ $(thisGrid.panel).show(0); // HACK: Fixes Chrome rendering issues when refreshing the grid on fuelux 3.1.0
+ thisGrid.firstLoad = false;
+ }
+
// HACK: Fix that only works if there is only one table at a time (dont works Safari)
// var newWidth = $(".repeater-list-wrapper > .table").width();
--
GitLab