From bfcb1fdb307ef3655badbb87767f84dc148f0c85 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Thu, 23 Jan 2020 18:24:14 +0100
Subject: [PATCH] =?UTF-8?q?N=C2=B02618=20-=20Fix=20missing=20scroll=20bar?=
 =?UTF-8?q?=20in=20DataModel=20Viewer=20for=20class=20with=20large=20numbe?=
 =?UTF-8?q?r=20of=20attributs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/light-grey.scss |  2 ++
 pages/schema.php    | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/css/light-grey.scss b/css/light-grey.scss
index f085f198f..67c348225 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -3469,7 +3469,9 @@ table.listResults .originColor{
 
 #dataModelSplitPane .ui-layout-center{
 	margin-left :30px !important;
+	height: auto !important;
 	height: initial !important;
+	width: auto !important;
 	width: initial !important;
 }
 ///////////////////
diff --git a/pages/schema.php b/pages/schema.php
index 6642041e3..d2f19c6d3 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -969,6 +969,30 @@ EOF
 		);
 
 	}
+	//for IE and edge
+	$oPage->add_ready_script(
+		<<<EOF
+           var parentwidth = $(".ui-layout-center.data-model-viewer").width();      
+			$("#dataModelScrollableDiv").width(parentwidth);
+			
+			$(window).resize(function() {
+			    clearTimeout(window.resizedFinished);
+			    window.resizedFinished = setTimeout(function(){
+			        var parentwidth = $(".ui-layout-center.data-model-viewer").width();      
+					$("#dataModelScrollableDiv").width(parentwidth);
+			    }, 250);
+			});
+			/*		$(".ui-layout-center.data-model-viewer").on('resize', function() {
+					       var parentwidth = $(".ui-layout-center.data-model-viewer").width();      
+					        $("#dataModelScrollableDiv").width(parentwidth);        
+					     }).trigger('resize');
+				}
+	            /*$(window).on('resize', function() {
+				       var parentwidth = $(".ui-layout-center.data-model-viewer").width();      
+				        $("#dataModelScrollableDiv").width(parentwidth);        
+				     });*/
+EOF
+	);
 
 	$oPage->SetCurrentTab('UI:Schema:Attributes');
 	$aConfig = array(