diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js index 05d1b2ffde6f8914530bf72bffd8cec96f1d0210..82931cea01b09baac4c6f2271134ac583c67e8e0 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/LayoutManager.js @@ -23,6 +23,7 @@ var LayoutManager = { thirdColumn : null, isResizingColumn : false, isLoadingView : false, + isBlocked : false, _init : function(isFirstTime) { var _this = this; @@ -338,7 +339,7 @@ var LayoutManager = { } }, canReload : function() { - return this.isResizingColumn === false && this.isLoadingView === false; + return this.isBlocked == false && this.isResizingColumn === false && this.isLoadingView === false && this.firstColumn.width() > 0; }, reloadView : function(view, forceFirstTime) { var _this = this; @@ -373,6 +374,7 @@ var LayoutManager = { this.secondColumnContentResize(); }, resize : function(view, forceFirstTime) { + console.log("resize"); if(this.canReload()) { this.reloadView(view, forceFirstTime); } diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js index fde937da3dd5a0e0078b9366521100e35b4f488b..52b19dfd27baa3f7e95ad909904fd399cd4418f7 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/controllers/MainController.js @@ -258,6 +258,7 @@ function MainController(profile) { this._changeView(newViewChange, arg, true, shouldStateBePushToHistory); } this._changeView = function(newViewChange, arg, shouldURLBePushToHistory, shouldStateBePushToHistory) { + LayoutManager.isBlocked = false; // // Dirty forms management, to avoid loosing changes. // @@ -463,6 +464,7 @@ function MainController(profile) { }); break; case "showEditExperimentPageFromIdentifier": + LayoutManager.isBlocked = true; // CKEDITOR owns hooks and variables that will break if the layout manager does its magic var _this = this; this.serverFacade.listExperimentsForIdentifiers([arg], function(data) { document.title = "" + ELNDictionary.getExperimentKindName(arg) + " " + arg; @@ -495,6 +497,7 @@ function MainController(profile) { //window.scrollTo(0,0); break; case "showEditSamplePageFromPermId": + LayoutManager.isBlocked = true; // CKEDITOR owns hooks and variables that will break if the layout manager does its magic var _this = this; var permId = null; var paginationInfo = null; @@ -614,6 +617,7 @@ function MainController(profile) { }); break; case "showEditDataSetPageFromPermId": + LayoutManager.isBlocked = true; // CKEDITOR owns hooks and variables that will break if the layout manager does its magic var _this = this; var dsCriteria = { entityKind : "DATASET",