From e05b3a5fb9af58d8dac8183c4cd7ef925be41a68 Mon Sep 17 00:00:00 2001
From: acognet <anne-catherine.cognet@combodo.com>
Date: Mon, 27 Jan 2020 10:44:45 +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

---
 pages/schema.php | 37 ++++++++++---------------------------
 1 file changed, 10 insertions(+), 27 deletions(-)

diff --git a/pages/schema.php b/pages/schema.php
index d2f19c6d3..8dfb6f474 100644
--- a/pages/schema.php
+++ b/pages/schema.php
@@ -969,31 +969,6 @@ 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(
 		'origincolor' => array('label' => "", 'description' => ""),
@@ -1107,7 +1082,7 @@ function DisplayClassHeader($oPage, $sClass)
 	$oPage->add("<h2 id=\"dataModelScrollableClassName\"><span class=\"attrLabel\">".MetaModel::GetName($sClass)."</span> <span class=\"parenthesis\">(</span><span class=\"attrCode\">".$sClass."</span><span class=\"parenthesis\">)</span></h2>");
 	$oPage->add("</div>");
 
-//content header
+	//content header
 	$oPage->add("<div id=\"dataModelHeader\">");
 	DisplayGranularityDisplayer($oPage);
 	$oPage->add("<div id=\"dataModelClassIcon\">".MetaModel::GetClassIcon($sClass)."</div>");
@@ -1118,6 +1093,9 @@ function DisplayClassHeader($oPage, $sClass)
 	{
 		$oPage->p(Dict::S('UI:Schema:AbstractClass'));
 	}
+	//ajuste the size of title
+	$oPage->add_ready_script("$('#dataModelScrollableDiv').width($('#dataModelScrollableDiv').parent().width());");
+
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -1178,7 +1156,12 @@ $oPage->add("</div>");
 $oPage->add_init_script(
 	<<<EOF
 		$('#dataModelSplitPane').layout({
-		west : {size: "20%", minSize : 200,paneSize : 600}
+			west : {size: "20%", minSize : 200,paneSize : 600},
+			center : {
+				onresize_end : function(){
+					$("#dataModelScrollableDiv").width($(".ui-layout-center.data-model-viewer").width());
+				}
+			}
 		});
 		// Layout
 EOF