From dce32ed48576f61effe35e18a5a57b03311c9658 Mon Sep 17 00:00:00 2001
From: yvesn <yvesn>
Date: Thu, 25 May 2017 17:10:44 +0000
Subject: [PATCH] SSDM-5068 : ELN config on GUI - using blockUI while loading
view - added disableFadeAnimation option to Util.js
SVN: 38221
---
.../1/as/webapps/eln-lims/html/js/util/Util.js | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/Util.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/Util.js
index 3bc38a65ed7..64a2f9bbce6 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/Util.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/Util.js
@@ -49,7 +49,7 @@ var Util = new function() {
});
}
- this.blockUI = function(message, extraCSS) {
+ this.blockUI = function(message, extraCSS, disabledFadeAnimation) {
this.unblockUI();
BlockScrollUtil.disable_scroll();
@@ -71,11 +71,17 @@ var Util = new function() {
}
$('#navbar').block({ message: '', css: { width: '0px' } });
+ var params = { css : css };
if(message) {
- $.blockUI({ message: message, css: css});
+ params.message = message;
} else {
- $.blockUI({ message: '<h1><img src="./img/busy.gif" /> Just a moment...</h1>', css: css });
+ params.message = '<h1><img src="./img/busy.gif" /> Just a moment...</h1>';
}
+ if (disabledFadeAnimation) {
+ params.fadeIn = 0;
+ params.fadeOut = 0;
+ }
+ $.blockUI(params);
//Enable/Disable scroll when the mouse goes in/out
$('.blockUI.blockMsg.blockPage').hover(function() {
--
GitLab