From cee44e3eee29be972ac8b56e374bc383dab3ac7e Mon Sep 17 00:00:00 2001
From: Yves Noirjean <yves.noirjean@id.ethz.ch>
Date: Fri, 18 May 2018 16:32:37 +0200
Subject: [PATCH] SDM-5545: when loading preview images, the spinner in only
added once
---
.../js/views/DataSetForm/widgets/ImagePreviewIconLoader.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/ImagePreviewIconLoader.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/ImagePreviewIconLoader.js
index c0830e100b9..258192ce3c8 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/ImagePreviewIconLoader.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/ImagePreviewIconLoader.js
@@ -34,7 +34,7 @@ function ImagePreviewIconLoader() {
}
this._shouldLoadPreview = function(node) {
- return ! node.data.previewLoaded && node.data.fileSize <= profile.datasetViewerMaxFilesizeForImagePreview;
+ return ! node.data.previewLoading && ! node.data.previewLoaded && node.data.fileSize <= profile.datasetViewerMaxFilesizeForImagePreview;
}
this._addToQueue = function(node) {
@@ -89,6 +89,8 @@ function ImagePreviewIconLoader() {
*/
this._loadImagePreview = function(params) {
+ params.node.data.previewLoading = true;
+
var $span = $(params.node.span);
var $imageContainer = $span.children("#image-container");
@@ -122,6 +124,7 @@ function ImagePreviewIconLoader() {
$imageContainer.append($iconImg);
params.node.data.previewLoaded = true;
+ params.node.data.previewLoading = false;
params.done();
});
}
--
GitLab