From 4094938aaaeb6f6e96a8f7852ed126977582e4c3 Mon Sep 17 00:00:00 2001
From: juanf <juanf@bsse-bs-dock-5-229.ethz.ch>
Date: Thu, 1 Nov 2018 14:17:30 +0100
Subject: [PATCH] SSDM-7228 : ios scroll fixes between portrait-landscape
---
.../eln-lims/html/js/controllers/LayoutManager.js | 3 +--
.../html/js/views/SideMenu/SideMenuWidgetView.js | 9 ++++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
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 e21e31151dc..d72ecdea949 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
@@ -407,8 +407,6 @@ var LayoutManager = {
this.isLoadingView = true;
var isFirstTime = this.mainContainer === null || forceFirstTime === true || forceFirstTime === undefined;
-
- this._init(isFirstTime);
var width = $( window ).width();
if (width > this.DESKTOP_SIZE) {
@@ -428,6 +426,7 @@ var LayoutManager = {
}
}
+ this._init(isFirstTime);
if (this.FOUND_SIZE === this.DESKTOP_SIZE) {
this._setDesktopLayout(view, isFirstTime);
} else if (this.FOUND_SIZE === this.TABLET_SIZE) {
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 3d5ce6c59e2..4ebfcadbbec 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
@@ -119,7 +119,14 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) {
var $body = $("<div>", {"id": "sideMenuBody"});
$body.css("overflow-y", "auto");
- $body.css("-webkit-overflow-scrolling", "touch");
+
+ LayoutManager.addResizeEventHandler(function() {
+ if(LayoutManager.FOUND_SIZE === LayoutManager.MOBILE_SIZE) {
+ $body.css("-webkit-overflow-scrolling", "auto");
+ } else {
+ $body.css("-webkit-overflow-scrolling", "touch");
+ }
+ });
$widget.append($header)
.append($body);
--
GitLab