From 31037e5defb78d7cfb705c63d205070a7cfdcd3d Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Tue, 5 Jul 2016 09:08:13 +0000
Subject: [PATCH] SSDM-3411 : ELN : Side Menu loading on demand (ongoing work)
SVN: 36787
---
.../eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js | 6 +++---
.../html/js/views/TrashManager/TrashManagerController.js | 4 +---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
index 53955d5e394..c1687b95ce8 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js
@@ -372,8 +372,8 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
}
};
- var onCollaps = function(event, data) {
- if(data.node.isExpanded() && data.node.lazy) { //Is going to be collapsed
+ var onCollapse = function(event, data) {
+ if(data.node.lazy) { //Is going to be collapsed
data.node.removeChildren();
data.node.resetLazy();
}
@@ -386,7 +386,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
lazyLoad : onLazyLoad,
click : onClick,
activate: onActivate,
- beforeExpand : onCollaps //Yes, for collapsing event we need to use expand
+ collapse : onCollapse //Yes, for collapsing event we need to use expand
});
this._sideMenuWidgetModel.menuDOMBody.append($tree);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerController.js
index f5d3bfdfdc0..ef89627675b 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/TrashManager/TrashManagerController.js
@@ -21,9 +21,7 @@ function TrashManagerController(mainController) {
this.revertDeletions = function(deletionIds) {
mainController.serverFacade.revertDeletions(deletionIds, function(data) {
- Util.showSuccess("Deletions Reverted. The application will reload automatically to show changes.", function() {
- location.reload();
- });
+ Util.showSuccess("Deletions Reverted.", function() {});
mainController.changeView('showTrashcanPage', null);
});
}
--
GitLab