From richfaces-svn-commits at lists.jboss.org Tue Sep  1 11:25:19 2009
Content-Type: multipart/mixed; boundary="===============6961623858118216569=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r15423 - in
 branches/community/3.3.X/ui/extendedDataTable/src/main:
 templates/org/richfaces and 1 other directory.
Date: Tue, 01 Sep 2009 11:25:19 -0400
Message-ID: <200909011525.n81FPJFe009773@svn01.web.mwc.hst.phx2.redhat.com>

--===============6961623858118216569==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: Alex.Kolonitsky
Date: 2009-09-01 11:25:18 -0400 (Tue, 01 Sep 2009)
New Revision: 15423

Modified:
   branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/Client=
UI/controls/datatable/ExtendedDataTable.js
   branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/ric=
hfaces/htmlExtendedDataTable.jspx
Log:
ExtendedDataTable problem with scrolls in case summary width of columns is =
begger then width of the table.
https://jira.jboss.org/jira/browse/RF-5751

Modified: branches/community/3.3.X/ui/extendedDataTable/src/main/javascript=
/ClientUI/controls/datatable/ExtendedDataTable.js
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/Clien=
tUI/controls/datatable/ExtendedDataTable.js	2009-09-01 15:14:35 UTC (rev 15=
422)
+++ branches/community/3.3.X/ui/extendedDataTable/src/main/javascript/Clien=
tUI/controls/datatable/ExtendedDataTable.js	2009-09-01 15:25:18 UTC (rev 15=
423)
@@ -298,9 +298,7 @@
         this.footer =3D $(this.id +":footer");
 		if (ClientUILib.isOpera) {
 			//no overflow-x nor overflow-y in Opera
-			this.scrollingDiv.setStyle({overflow: 'scroll',
-				width: this.mainDiv.getWidth()
-			});
+			this.scrollingDiv.setStyle({width: this.mainDiv.getWidth()});
 			this.table.setStyle({width: this.mainDiv.getWidth()});
 		};
 		=

@@ -401,7 +399,10 @@
         cols[columnsNumber-1].width =3D null;
         cols[cols.length-1].width =3D null;
 		var newHeight =3D mainDivHeight - header.getHeight() - footerHeight - 2;
-		newHeight -=3D this.header.getCaptionHeight();
+		var caption =3D header.getCaption()
+		if (caption && caption.tagName =3D=3D "caption") {
+			newHeight -=3D this.header.getCaptionHeight();
+		}
 		scrollingDiv.setStyle('height:'+ newHeight +'px;');
 		this._redrawTable(table);
 		header.adjustSeparators();

Modified: branches/community/3.3.X/ui/extendedDataTable/src/main/templates/=
org/richfaces/htmlExtendedDataTable.jspx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/ri=
chfaces/htmlExtendedDataTable.jspx	2009-09-01 15:14:35 UTC (rev 15422)
+++ branches/community/3.3.X/ui/extendedDataTable/src/main/templates/org/ri=
chfaces/htmlExtendedDataTable.jspx	2009-09-01 15:25:18 UTC (rev 15423)
@@ -54,17 +54,16 @@
 		>
 =

 	<div id=3D"#{clientId}:od" class=3D"extdt-outerdiv"
-		style=3D"width:100%; height:100%;overflow-y:hidden;overflow-x:auto;"
+		style=3D"width:100%; height:100%;overflow: hidden;"
 		>
 		<div id=3D"#{clientId}:dataTable_indicator" class=3D"drgind_fly drgind_d=
efault drag_indicator" style=3D"display: none;" >
 	        <f:call name=3D"encodeNamespace" />
-	        =

-	        <script type=3D"text/javascript">
-	            //<![CDATA[
-	            #{this:encodeDragDropChildScripts(context, component)};
-	            //]]>
-	        </script>
 	    </div>
+        <script type=3D"text/javascript">
+            //<![CDATA[
+            #{this:encodeDragDropChildScripts(context, component)};
+            //]]>
+        </script>
 	    <span id=3D"#{clientId}:dataTable_indicator_span" />
 		<div id=3D"#{clientId}:innerd" class=3D"extdt-innerdiv" style=3D"height:=
100%;width:100%;">
 		<div id=3D"#{clientId}:cs" class=3D"extdt-hsplit" style=3D"display: none=
;"/>
@@ -82,7 +81,7 @@
 			<tbody>
 				<tr>
 					<td colspan=3D"#{columnsCount}" style=3D"padding: 0px;">
-						<div id=3D"#{clientId}:sd" class=3D"extdt-content" style=3D"height:5=
0px;width:100%;">
+						<div id=3D"#{clientId}:sd" class=3D"extdt-content" style=3D"height:5=
0px;width:100%;overflow:hidden;">
 							<jsp:scriptlet>
 				     		<![CDATA[
 								if (component.getRowCount() <=3D 0) {
@@ -103,7 +102,7 @@
 								}
 							]]>	=

 							</jsp:scriptlet>
-							<table id=3D"#{clientId}:n" width=3D"100%"
+							<table id=3D"#{clientId}:n" style=3D"width:100%; height:100%;overfl=
ow: hidden;"
 					    				class=3D"extdt-table-layout rich-table #{component.attributes=
['styleClass']}"
 			  						>
 								<f:call name=3D"utils.encodePassThruWithExclusions">


--===============6961623858118216569==--