From richfaces-svn-commits at lists.jboss.org Wed Jul  3 17:53:53 2013
Content-Type: multipart/mixed; boundary="===============1663335494624872914=="
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: r23244 - in
 branches/enterprise/3.3.1.SP3_test_patch:
 ui/scrollableDataTable/src/main/javascript and 1 other directory.
Date: Wed, 03 Jul 2013 17:53:52 -0400
Message-ID: <201307032153.r63LrqFf017833@svn01.web.mwc.hst.phx2.redhat.com>

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

Author: bleathem
Date: 2013-07-03 17:53:52 -0400 (Wed, 03 Jul 2013)
New Revision: 23244

Added:
   branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main=
/webapp/richfaces/scrollableDataTable2.xhtml
Modified:
   branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main=
/javascript/ClientUILib.js
Log:
RF-7169: Fixed the browser detection for msie >=3D 9 broswers running in ms=
ie 8 document mode

Added: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/=
main/webapp/richfaces/scrollableDataTable2.xhtml
=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/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/mai=
n/webapp/richfaces/scrollableDataTable2.xhtml	                        (rev =
0)
+++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/mai=
n/webapp/richfaces/scrollableDataTable2.xhtml	2013-07-03 21:53:52 UTC (rev =
23244)
@@ -0,0 +1,88 @@
+<ui:composition xmlns=3D"http://www.w3.org/1999/xhtml"
+      xmlns:ui=3D"http://java.sun.com/jsf/facelets"
+      xmlns:h=3D"http://java.sun.com/jsf/html"
+      xmlns:f=3D"http://java.sun.com/jsf/core"
+      xmlns:a4j=3D"http://richfaces.org/a4j"
+      xmlns:rich=3D"http://richfaces.org/rich">
+
+		<style>
+			.scrolls{
+				width:300px;
+				height:200px;
+				overflow:auto;
+			}
+		</style>	=

+		<h:form>
+			<rich:spacer height=3D"30" />
+			<rich:scrollableDataTable rowKeyVar=3D"rkv" frozenColCount=3D"1" height=
=3D"400px" =

+				width=3D"400px" id=3D"carList" rows=3D"40" columnClasses=3D"col"
+				value=3D"#{dataTableScrollerBean.allCars}" var=3D"category" sortMode=
=3D"single"
+				binding=3D"#{dataTableScrollerBean.table}"
+				sortOrder=3D"#{dataTableScrollerBean.order}"
+				selection=3D"#{dataTableScrollerBean.selection}">
+
+				<rich:column id=3D"make">
+					<f:facet name=3D"header"><h:outputText styleClass=3D"headerText" valu=
e=3D"Make" /></f:facet>
+					<h:outputText value=3D"#{category.make}" />
+				</rich:column>
+				<rich:column id=3D"model">
+					<f:facet name=3D"header"><h:outputText styleClass=3D"headerText" valu=
e=3D"Model" /></f:facet>
+					<h:outputText value=3D"#{category.model}" />
+                    <h:inputText value=3D""/>
+				</rich:column>
+				<rich:column id=3D"price">
+					<f:facet name=3D"header"><h:outputText styleClass=3D"headerText" valu=
e=3D"Price" /></f:facet>
+					<h:outputText value=3D"#{category.price}" />
+				</rich:column>
+				<rich:column id=3D"mileage">
+					<f:facet name=3D"header"><h:outputText styleClass=3D"headerText" valu=
e=3D"Mileage" /></f:facet>
+					<h:outputText value=3D"#{category.mileage}" />
+				</rich:column>
+				<rich:column width=3D"200px" id=3D"vin">
+					<f:facet name=3D"header"><h:outputText styleClass=3D"headerText" valu=
e=3D"VIN" /></f:facet>
+					<h:outputText value=3D"#{category.vin}" />
+				</rich:column>
+				<rich:column id=3D"stock">
+					<f:facet name=3D"header"><h:outputText styleClass=3D"headerText" valu=
e=3D"Stock" /></f:facet>
+					<h:outputText value=3D"#{category.stock}" />
+                    <h:inputText value=3D""/>
+				</rich:column>
+			</rich:scrollableDataTable>
+			<rich:spacer height=3D"20px"/>
+			<a4j:commandButton value=3D"Show Current Selection" reRender=3D"table" =

+				action=3D"#{dataTableScrollerBean.takeSelection}" =

+				oncomplete=3D"javascript:Richfaces.showModalPanel('panel');"/>
+		</h:form>
+		<rich:modalPanel id=3D"panel" autosized=3D"false" keepVisualState=3D"fal=
se" width=3D"315" height=3D"230">
+				<f:facet name=3D"header">
+					<h:outputText value=3D"Selected Rows"/>
+				</f:facet>
+				<f:facet name=3D"controls">
+					<span style=3D"cursor:pointer" onclick=3D"javascript:Richfaces.hideMo=
dalPanel('panel')">X</span>
+				</f:facet>
+			<h:panelGroup layout=3D"block" styleClass=3D"scrolls">
+			<rich:dataTable value=3D"#{dataTableScrollerBean.selectedCars}" var=3D"=
sel" id=3D"table">
+				<rich:column>
+					<f:facet name=3D"header"><h:outputText value=3D"Make" /></f:facet>
+					<h:outputText value=3D"#{sel.make}" />
+				</rich:column>
+				<rich:column id=3D"model">
+					<f:facet name=3D"header"><h:outputText value=3D"Model" /></f:facet>
+                    <h:inputText value=3D""/>
+				</rich:column>
+				<rich:column id=3D"price">
+					<f:facet name=3D"header"><h:outputText value=3D"Price" /></f:facet>
+					<h:outputText value=3D"#{sel.price}" />
+				</rich:column>
+				<rich:column id=3D"mileage">
+					<f:facet name=3D"header"><h:outputText value=3D"Mileage" /></f:facet>
+					<h:outputText value=3D"#{sel.mileage}" />
+				</rich:column>
+				<rich:column id=3D"stock">
+					<f:facet name=3D"header"><h:outputText value=3D"Stock" /></f:facet>
+                    <h:inputText value=3D""/>
+				</rich:column>
+			</rich:dataTable>
+			</h:panelGroup>
+		</rich:modalPanel>
+</ui:composition>

Modified: branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/s=
rc/main/javascript/ClientUILib.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/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/mai=
n/javascript/ClientUILib.js	2013-06-28 17:52:42 UTC (rev 23243)
+++ branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/mai=
n/javascript/ClientUILib.js	2013-07-03 21:53:52 UTC (rev 23244)
@@ -99,30 +99,37 @@
 		var ua =3D navigator.userAgent.toLowerCase();
 		/** @type Boolean */
 		this.isOpera =3D (ua.indexOf('opera') > -1);
-	   	/** @type Boolean */
+		/** @type Boolean */
 		this.isSafari =3D (ua.indexOf('webkit') > -1);
-	   	/** @type Boolean */
+		/** @type Boolean */
 		this.isIE =3D (window.ActiveXObject);
+		if (typeof document.documentMode !=3D=3D 'undefined') {
+			/** @type Boolean */
+			this.isIE7 =3D (document.documentMode =3D=3D=3D 7);
+			/** @type Boolean */
+			this.isIE8 =3D (document.documentMode =3D=3D=3D 8);
+		} else {
+			/** @type Boolean */
+			this.isIE7 =3D (ua.indexOf('msie 7') > -1);
+			/** @type Boolean */
+			this.isIE8 =3D (ua.indexOf('msie 8') > -1);
+		}
 	   	/** @type Boolean */
-		this.isIE7 =3D (ua.indexOf('msie 7') > -1);
-	   	/** @type Boolean */
-		this.isIE8 =3D (ua.indexOf('msie 8') > -1);
-	   	/** @type Boolean */
 		this.isGecko =3D !this.isSafari && (ua.indexOf('gecko') > -1);
-		=

+
 		if(ua.indexOf("windows") !=3D -1 || ua.indexOf("win32") !=3D -1){
-		    /** @type Boolean */
-		    this.isWindows =3D true;
+			/** @type Boolean */
+			this.isWindows =3D true;
 		}else if(ua.indexOf("macintosh") !=3D -1){
 			/** @type Boolean */
-		    this.isMac =3D true;
+			this.isMac =3D true;
 		}
 		if(this.isIE && !this.isIE7){
-	        try{
-	            document.execCommand("BackgroundImageCache", false, true);
-	        }catch(e){}
-	    }
-	}	=

+			try{
+				document.execCommand("BackgroundImageCache", false, true);
+			}catch(e){}
+		}
+	}
 };
 =

 var ClientUILogger =3D {


--===============1663335494624872914==--