From 4593c221614c2ba286c8ef82855f0bc4369e8ba1 Mon Sep 17 00:00:00 2001
From: "Fuentes Serna Juan Mariano (ID SIS)" <juanf@bs-mbpr28.d.ethz.ch>
Date: Thu, 8 Feb 2018 14:25:41 +0100
Subject: [PATCH] SSDM-6169 : Bugfix, App breaks when CKEditor is in full
screen mode and the user resizes the window
---
.../webapps/eln-lims/html/js/controllers/LayoutManager.js | 2 +-
.../1/as/webapps/eln-lims/html/js/util/FormUtil.js | 2 ++
.../html/js/views/DataSetForm/DataSetFormController.js | 8 ++++++++
3 files changed, 11 insertions(+), 1 deletion(-)
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 7e69a608a4c..99b7371fdb0 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
@@ -376,7 +376,7 @@ var LayoutManager = {
},
resize : function(view, forceFirstTime) {
if(this.canReload()) {
- console.log("reloadView");
+ // console.log("reloadView");
this.reloadView(view, forceFirstTime);
}
}
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
index 83fd0a6ef04..5586b427197 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
@@ -833,6 +833,8 @@ var FormUtil = new function() {
var destroyAndRecreateFunc = destroyAndRecreate($component);
+ mainController.currentView._windowHandlers.push(destroyAndRecreateFunc);
+
destroyAndRecreateFunc();
LayoutManager.addResizeEventHandler(destroyAndRecreateFunc);
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
index d64396c5753..b5baff49b98 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/DataSetFormController.js
@@ -18,6 +18,14 @@ function DataSetFormController(parentController, mode, entity, dataSet, isMini)
this._parentController = parentController;
this._dataSetFormModel = new DataSetFormModel(mode, entity, dataSet, isMini);
this._dataSetFormView = new DataSetFormView(this, this._dataSetFormModel);
+ this._windowHandlers = [];
+
+ this.finalize = function() {
+ for(var whIdx = 0; whIdx < this._windowHandlers.length; whIdx++) {
+ $(window).off("resize", this._windowHandlers[whIdx]);
+ }
+ $("#mainContainer").css("overflow-y", "auto");
+ }
this.init = function(views) {
var _this = this;
--
GitLab