July 2013 - richfaces-svn-commits

JBoss Rich Faces SVN: r23266 - in branches/enterprise/3.3.1.SP3_test_patch: framework/impl/src/main/resources/org/ajax4jsf and 4 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: ivassile Date: 2013-07-29 08:56:53 -0400 (Mon, 29 Jul 2013) New Revision: 23266 Added: branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/LookAheadObjectInputStream.java branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/SerializableResource.java branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/resources/org/ajax4jsf/resource/ branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/resources/org/ajax4jsf/resource/resource-serialization.properties Modified: branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/UserResource.java branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/MediaData.java branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/java/org/richfaces/demo/paint2d/PaintData.java branches/enterprise/3.3.1.SP3_test_patch/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java Log: Applying security patch CVE-2013-2165 (JBPAPP-10776) Added: branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/LookAheadObjectInputStream.java =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/LookAheadObjectInputStream.java (rev 0) +++ branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/LookAheadObjectInputStream.java 2013-07-29 12:56:53 UTC (rev 23266) @@ -0,0 +1,148 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + **/ +package org.ajax4jsf.resource; + +import java.io.IOException; +import java.io.InputStream; +import java.io.InvalidClassException; +import java.io.ObjectInputStream; +import java.io.ObjectStreamClass; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +/** + * When deserializing objects, first check that the class being deserialized is in the allowed whitelist. + * + * @author <a href="http://community.jboss.org/people/bleathem">Brian Leathem</a> + */ +public class LookAheadObjectInputStream extends ObjectInputStream { + private static final Map<String, Class<?>> PRIMITIVE_TYPES = new HashMap<String, Class<?>>(9, 1.0F); + private static Set<Class> whitelistBaseClasses = new HashSet<Class>(); + private static Set<String> whitelistClassNameCache = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>()); + + static { + PRIMITIVE_TYPES.put("bool", Boolean.TYPE); + PRIMITIVE_TYPES.put("byte", Byte.TYPE); + PRIMITIVE_TYPES.put("char", Character.TYPE); + PRIMITIVE_TYPES.put("short", Short.TYPE); + PRIMITIVE_TYPES.put("int", Integer.TYPE); + PRIMITIVE_TYPES.put("long", Long.TYPE); + PRIMITIVE_TYPES.put("float", Float.TYPE); + PRIMITIVE_TYPES.put("double", Double.TYPE); + PRIMITIVE_TYPES.put("void", Void.TYPE); + + whitelistClassNameCache.add(new Object[0].getClass().getName()); + whitelistClassNameCache.add(new String[0].getClass().getName()); + whitelistClassNameCache.add(new Boolean[0].getClass().getName()); + whitelistClassNameCache.add(new Byte[0].getClass().getName()); + whitelistClassNameCache.add(new Character[0].getClass().getName()); + whitelistClassNameCache.add(new Short[0].getClass().getName()); + whitelistClassNameCache.add(new Integer[0].getClass().getName()); + whitelistClassNameCache.add(new Long[0].getClass().getName()); + whitelistClassNameCache.add(new Float[0].getClass().getName()); + whitelistClassNameCache.add(new Double[0].getClass().getName()); + whitelistClassNameCache.add(new Void[0].getClass().getName()); + + whitelistBaseClasses.add(String.class); + whitelistBaseClasses.add(Boolean.class); + whitelistBaseClasses.add(Byte.class); + whitelistBaseClasses.add(Character.class); + whitelistBaseClasses.add(Number.class); + + loadWhitelist(); + } + + public LookAheadObjectInputStream(InputStream in) throws IOException { + super(in); + } + + /** + * Only deserialize primitive or whitelisted classes + */ + @Override + protected Class<?> resolveClass(ObjectStreamClass desc) throws IOException, ClassNotFoundException { + Class<?> primitiveType = PRIMITIVE_TYPES.get(desc.getName()); + if (primitiveType != null) { + return primitiveType; + } + if (!isClassValid(desc.getName())) { + throw new InvalidClassException("Unauthorized deserialization attempt", desc.getName()); + } + return super.resolveClass(desc); + } + + /** + * Determine if the given requestedClassName is allowed by the whitelist + */ + boolean isClassValid(String requestedClassName) { + if (whitelistClassNameCache.contains(requestedClassName)) { + return true; + } + try { + Class<?> requestedClass = Class.forName(requestedClassName); + for (Class baseClass : whitelistBaseClasses ) { + if (baseClass.isAssignableFrom(requestedClass)) { + whitelistClassNameCache.add(requestedClassName); + return true; + } + } + } catch (ClassNotFoundException e) { + return false; + } + return false; + } + + /** + * Load the whitelist from the properties file + */ + static void loadWhitelist() { + Properties whitelistProperties = new Properties(); + InputStream stream = null; + try { + stream = LookAheadObjectInputStream.class.getResourceAsStream("resource-serialization.properties"); + whitelistProperties.load(stream); + } catch (IOException e) { + throw new RuntimeException("Error loading the ResourceBuilder.properties file", e); + } finally { + if (stream != null) { + try { + stream.close(); + } catch (IOException e) { + throw new RuntimeException("Error closing the ResourceBuilder.properties file", e); + } + } + } + for (String baseClassName : whitelistProperties.getProperty("whitelist").split(",")) { + try { + Class<?> baseClass = Class.forName(baseClassName); + whitelistBaseClasses.add(baseClass); + } catch (ClassNotFoundException e) { + throw new RuntimeException("Unable to load whiteList class " + baseClassName, e); + } + } + } +} Modified: branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java 2013-07-19 03:04:33 UTC (rev 23265) +++ branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/ResourceBuilderImpl.java 2013-07-29 12:56:53 UTC (rev 23266) @@ -374,8 +374,7 @@ data = objectArray; } else { try { - ObjectInputStream in = new ObjectInputStream( - new ByteArrayInputStream(objectArray)); + ObjectInputStream in = new LookAheadObjectInputStream(new ByteArrayInputStream(objectArray)); data = in.readObject(); } catch (StreamCorruptedException e) { log.error(Messages Added: branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/SerializableResource.java =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/SerializableResource.java (rev 0) +++ branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/SerializableResource.java 2013-07-29 12:56:53 UTC (rev 23266) @@ -0,0 +1,31 @@ +/** + * JBoss, Home of Professional Open Source + * Copyright 2010, Red Hat, Inc. and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + **/ +package org.ajax4jsf.resource; + +/** + * A marker interface, used to indicate that the class implementing this interfaces is cleared for deserialisation by + * the LookAheadObjectInputStream + * + * @author <a href="http://community.jboss.org/people/bleathem">Brian Leathem</a> + */ +public interface SerializableResource extends java.io.Serializable { +} Modified: branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/UserResource.java =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/UserResource.java 2013-07-19 03:04:33 UTC (rev 23265) +++ branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/java/org/ajax4jsf/resource/UserResource.java 2013-07-29 12:56:53 UTC (rev 23266) @@ -23,7 +23,6 @@ import java.io.IOException; import java.io.OutputStream; -import java.io.Serializable; import java.util.Date; import javax.el.ELContext; @@ -156,7 +155,7 @@ return true; } - public static class UriData implements Serializable { + public static class UriData implements SerializableResource { /** * Added: branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/resources/org/ajax4jsf/resource/resource-serialization.properties =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/resources/org/ajax4jsf/resource/resource-serialization.properties (rev 0) +++ branches/enterprise/3.3.1.SP3_test_patch/framework/impl/src/main/resources/org/ajax4jsf/resource/resource-serialization.properties 2013-07-29 12:56:53 UTC (rev 23266) @@ -0,0 +1 @@ +whitelist = org.ajax4jsf.resource.InternetResource,org.ajax4jsf.resource.SerializableResource,javax.el.Expression,javax.faces.el.MethodBinding,javax.faces.component.StateHolderSaver,java.awt.Color \ No newline at end of file Modified: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/MediaData.java =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/MediaData.java 2013-07-19 03:04:33 UTC (rev 23265) +++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/java/org/richfaces/demo/media/MediaData.java 2013-07-29 12:56:53 UTC (rev 23266) @@ -1,10 +1,11 @@ package org.richfaces.demo.media; import java.awt.Color; -import java.io.Serializable; -public class MediaData implements Serializable{ +import org.ajax4jsf.resource.SerializableResource; +public class MediaData implements SerializableResource { + private static final long serialVersionUID = 1L; Integer Width=110; Integer Height=50; Modified: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/java/org/richfaces/demo/paint2d/PaintData.java =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/java/org/richfaces/demo/paint2d/PaintData.java 2013-07-19 03:04:33 UTC (rev 23265) +++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/java/org/richfaces/demo/paint2d/PaintData.java 2013-07-29 12:56:53 UTC (rev 23266) @@ -1,8 +1,8 @@ package org.richfaces.demo.paint2d; -import java.io.Serializable; +import org.ajax4jsf.resource.SerializableResource; -public class PaintData implements Serializable{ +public class PaintData implements SerializableResource { /** * */ Modified: branches/enterprise/3.3.1.SP3_test_patch/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java 2013-07-19 03:04:33 UTC (rev 23265) +++ branches/enterprise/3.3.1.SP3_test_patch/ui/paint2D/src/main/java/org/richfaces/renderkit/html/Paint2DResource.java 2013-07-29 12:56:53 UTC (rev 23266) @@ -27,7 +27,6 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.io.IOException; -import java.io.Serializable; import javax.faces.FacesException; import javax.faces.component.UIComponentBase; @@ -41,6 +40,7 @@ import org.ajax4jsf.resource.PngRenderer; import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.resource.ResourceRenderer; +import org.ajax4jsf.resource.SerializableResource; import org.ajax4jsf.util.HtmlColor; import org.richfaces.component.UIPaint2D; @@ -126,7 +126,7 @@ } } - private static final class ImageData implements Serializable { + private static final class ImageData implements SerializableResource { private static final long serialVersionUID = 4452040100045367728L;

11 years, 4 months

1
0
0 / 0

JBoss Rich Faces SVN: r23265 - in branches/enterprise/3.3.1.SP3_test_patch: samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: bleathem Date: 2013-07-18 23:04:33 -0400 (Thu, 18 Jul 2013) New Revision: 23265 Modified: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.xhtml branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js Log: RF-1107: Fixed tabbing in scrollableDataTable header cells Modified: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2013-07-18 19:51:47 UTC (rev 23264) +++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/WEB-INF/web.xml 2013-07-19 03:04:33 UTC (rev 23265) @@ -38,11 +38,11 @@ </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name> - <param-value>true</param-value> + <param-value>false</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.COMPRESS_STYLE</param-name> - <param-value>true</param-value> + <param-value>false</param-value> </context-param> <context-param> <param-name>org.ajax4jsf.xmlparser.ORDER</param-name> @@ -58,11 +58,11 @@ </context-param> <context-param> <param-name>org.richfaces.LoadStyleStrategy</param-name> - <param-value>ALL</param-value> + <param-value>DEFAULT</param-value> </context-param> <context-param> <param-name>org.richfaces.LoadScriptStrategy</param-name> - <param-value>ALL</param-value> + <param-value>DEFAULT</param-value> </context-param> <listener> Modified: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.xhtml =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.xhtml 2013-07-18 19:51:47 UTC (rev 23264) +++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.xhtml 2013-07-19 03:04:33 UTC (rev 23265) @@ -1,34 +1,43 @@ -<ui:composition xmlns="http://www.w3.org/1999/xhtml" +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> - <style> - .scrolls{ - width:300px; - height:200px; - overflow:auto; - } - </style> - <h:form> + <head> + <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8"/> + <meta http-equiv="x-ua-compatible" content="IE=8"/> + <title> + <ui:insert name="title"/> + </title> + <style type="text/css"> + .scrolls{ + width:300px; + height:200px; + overflow:auto; + } + </style> + </head> + <body> + <h:form> <rich:spacer height="30" /> <rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px" width="400px" id="carList" rows="40" columnClasses="col" value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single" binding="#{dataTableScrollerBean.table}" - sortOrder="#{dataTableScrollerBean.order}" + sortOrder="#{dataTableScrollerBean.order}" selection="#{dataTableScrollerBean.selection}"> <rich:column id="make"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Make" /></f:facet> + <f:facet name="header"><h:outputText styleClass="headerText" value="Make" /><h:inputText value="" size="4" /></f:facet> <h:outputText value="#{category.make}" /> </rich:column> <rich:column id="model"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Model" /><h:inputText value=""/></f:facet> + <f:facet name="header"><h:outputText styleClass="headerText" value="Model" /><h:inputText value="" size="4"/></f:facet> <h:outputText value="#{category.model}" /> - <h:inputText value=""/> + <h:inputText value="" size="4"/> </rich:column> <rich:column id="price"> <f:facet name="header"><h:outputText styleClass="headerText" value="Price" /></f:facet> @@ -43,46 +52,47 @@ <h:outputText value="#{category.vin}" /> </rich:column> <rich:column id="stock"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Stock" /><h:inputText value=""/></f:facet> + <f:facet name="header"><h:outputText styleClass="headerText" value="Stock" /><h:inputText value="" size="4"/></f:facet> <h:outputText value="#{category.stock}" /> - <h:inputText value=""/> + <h:inputText value="" size="4"/> </rich:column> - </rich:scrollableDataTable> - <rich:spacer height="20px"/> - <a4j:commandButton value="Show Current Selection" reRender="table" - action="#{dataTableScrollerBean.takeSelection}" - oncomplete="javascript:Richfaces.showModalPanel('panel');"/> + </rich:scrollableDataTable> + <rich:spacer height="20px"/> + <a4j:commandButton value="Show Current Selection" reRender="table" + action="#{dataTableScrollerBean.takeSelection}" + oncomplete="javascript:Richfaces.showModalPanel('panel');"/> </h:form> - <rich:modalPanel id="panel" autosized="false" keepVisualState="false" width="315" height="230"> - <f:facet name="header"> - <h:outputText value="Selected Rows"/> - </f:facet> - <f:facet name="controls"> - <span style="cursor:pointer" onclick="javascript:Richfaces.hideModalPanel('panel')">X</span> - </f:facet> + <rich:modalPanel id="panel" autosized="false" keepVisualState="false" width="315" height="230"> + <f:facet name="header"> + <h:outputText value="Selected Rows"/> + </f:facet> + <f:facet name="controls"> + <span style="cursor:pointer" onclick="javascript:Richfaces.hideModalPanel('panel')">X</span> + </f:facet> <h:panelGroup layout="block" styleClass="scrolls"> - <rich:dataTable value="#{dataTableScrollerBean.selectedCars}" var="sel" id="table"> - <rich:column> - <f:facet name="header"><h:outputText value="Make" /></f:facet> - <h:outputText value="#{sel.make}" /> - </rich:column> - <rich:column id="model"> - <f:facet name="header"><h:outputText value="Model" /></f:facet> - <h:inputText value=""/> - </rich:column> - <rich:column id="price"> - <f:facet name="header"><h:outputText value="Price" /></f:facet> - <h:outputText value="#{sel.price}" /> - </rich:column> - <rich:column id="mileage"> - <f:facet name="header"><h:outputText value="Mileage" /></f:facet> - <h:outputText value="#{sel.mileage}" /> - </rich:column> - <rich:column id="stock"> - <f:facet name="header"><h:outputText value="Stock" /></f:facet> - <h:inputText value=""/> - </rich:column> + <rich:dataTable value="#{dataTableScrollerBean.selectedCars}" var="sel" id="table"> + <rich:column> + <f:facet name="header"><h:outputText value="Make" /></f:facet> + <h:outputText value="#{sel.make}" /> + </rich:column> + <rich:column id="model"> + <f:facet name="header"><h:outputText value="Model" /></f:facet> + <h:inputText value="" size="4"/> + </rich:column> + <rich:column id="price"> + <f:facet name="header"><h:outputText value="Price" /></f:facet> + <h:outputText value="#{sel.price}" /> + </rich:column> + <rich:column id="mileage"> + <f:facet name="header"><h:outputText value="Mileage" /></f:facet> + <h:outputText value="#{sel.mileage}" /> + </rich:column> + <rich:column id="stock"> + <f:facet name="header"><h:outputText value="Stock" /></f:facet> + <h:inputText value="" size="4"/> + </rich:column> </rich:dataTable> - </h:panelGroup> + </h:panelGroup> </rich:modalPanel> -</ui:composition> +</body> + </html> \ No newline at end of file Modified: branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2013-07-18 19:51:47 UTC (rev 23264) +++ branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2013-07-19 03:04:33 UTC (rev 23265) @@ -101,8 +101,13 @@ Event.observe(this.frozenContentBox.getElement(), "keyup", this.synchronizeKeyUp.bindAsEventListener(this)); Event.observe(this.frozenContentBox.getElement(), "keydown", this.synchronizeKeyDown.bindAsEventListener(this)); Event.observe(this.frozenContentBox.getElement(), "scroll", this.synchronizeScroll.bindAsEventListener(this)); + + var gridHeader = this.grid.getHeader(); + Event.observe(gridHeader.contentBox.getElement(), "keyup", this.synchronizeHeaderKeyUp.bindAsEventListener(gridHeader)); + Event.observe(gridHeader.contentBox.getElement(), "keydown", this.synchronizeKeyDown.bindAsEventListener(gridHeader)); + Event.observe(gridHeader.frozenContentBox.getElement(), "keyup", this.synchronizeHeaderKeyUp.bindAsEventListener(gridHeader)); + Event.observe(gridHeader.frozenContentBox.getElement(), "keydown", this.synchronizeKeyDown.bindAsEventListener(gridHeader)); - this.helpObject1 = new ClientUI.common.box.Box(this.gridId + ":nho", this.contentBox.getElement()); this.helpObject2 = new ClientUI.common.box.Box(this.gridId + ":fho", this.frozenContentBox.getElement()); @@ -686,8 +691,11 @@ }, synchronizeKeyUp: function (event) { - if (Event.KEY_TAB == event.keyCode || Event.KEY_TAB == event.charCode) { - var k = 0; + if (Event.KEY_TAB == event.keyCode || Event.KEY_TAB == event.charCode) { + if (ClientUILib.isIE7 || ClientUILib.isIE8) { + this.grid.getBody().frozenContentBox.element.scrollTop = this.grid.getBody().contentBox.element.scrollTop; + } + var k = 0; var el = document.activeElement; if (el) { k += el.offsetLeft; @@ -705,7 +713,27 @@ } } } - } + }, + + synchronizeHeaderKeyUp: function (event) { + if (Event.KEY_TAB == event.keyCode || Event.KEY_TAB == event.charCode) { + var k = 0; + var el = document.activeElement; + if (el) { + k += el.offsetLeft; + while (el.parentElement.id.indexOf("NormalBox")<0) { + el = el.parentElement; + k += el.offsetLeft; + if (el.parentElement.id.indexOf("FrozenBox")>=0) { + k = 0; + this.grid.getBody().scrollBox.element.scrollLeft = 0; + return; + } + } + this.grid.getBody().scrollBox.element.scrollLeft = k; + } + } + } }); Object.extend(ClientUI.controls.grid.GridBody.prototype, {

11 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r23264 - in branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces: scrollableDataTable/examples and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: bleathem Date: 2013-07-18 15:51:47 -0400 (Thu, 18 Jul 2013) New Revision: 23264 Added: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.xhtml branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf7169.xhtml Removed: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable2.xhtml Log: Committed the reproducers for rf7169 and rf1107 Added: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.xhtml =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.xhtml (rev 0) +++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf1107.xhtml 2013-07-18 19:51:47 UTC (rev 23264) @@ -0,0 +1,88 @@ +<ui:composition xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + + <style> + .scrolls{ + width:300px; + height:200px; + overflow:auto; + } + </style> + <h:form> + <rich:spacer height="30" /> + <rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px" + width="400px" id="carList" rows="40" columnClasses="col" + value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single" + binding="#{dataTableScrollerBean.table}" + sortOrder="#{dataTableScrollerBean.order}" + selection="#{dataTableScrollerBean.selection}"> + + <rich:column id="make"> + <f:facet name="header"><h:outputText styleClass="headerText" value="Make" /></f:facet> + <h:outputText value="#{category.make}" /> + </rich:column> + <rich:column id="model"> + <f:facet name="header"><h:outputText styleClass="headerText" value="Model" /><h:inputText value=""/></f:facet> + <h:outputText value="#{category.model}" /> + <h:inputText value=""/> + </rich:column> + <rich:column id="price"> + <f:facet name="header"><h:outputText styleClass="headerText" value="Price" /></f:facet> + <h:outputText value="#{category.price}" /> + </rich:column> + <rich:column id="mileage"> + <f:facet name="header"><h:outputText styleClass="headerText" value="Mileage" /></f:facet> + <h:outputText value="#{category.mileage}" /> + </rich:column> + <rich:column width="200px" id="vin"> + <f:facet name="header"><h:outputText styleClass="headerText" value="VIN" /></f:facet> + <h:outputText value="#{category.vin}" /> + </rich:column> + <rich:column id="stock"> + <f:facet name="header"><h:outputText styleClass="headerText" value="Stock" /><h:inputText value=""/></f:facet> + <h:outputText value="#{category.stock}" /> + <h:inputText value=""/> + </rich:column> + </rich:scrollableDataTable> + <rich:spacer height="20px"/> + <a4j:commandButton value="Show Current Selection" reRender="table" + action="#{dataTableScrollerBean.takeSelection}" + oncomplete="javascript:Richfaces.showModalPanel('panel');"/> + </h:form> + <rich:modalPanel id="panel" autosized="false" keepVisualState="false" width="315" height="230"> + <f:facet name="header"> + <h:outputText value="Selected Rows"/> + </f:facet> + <f:facet name="controls"> + <span style="cursor:pointer" onclick="javascript:Richfaces.hideModalPanel('panel')">X</span> + </f:facet> + <h:panelGroup layout="block" styleClass="scrolls"> + <rich:dataTable value="#{dataTableScrollerBean.selectedCars}" var="sel" id="table"> + <rich:column> + <f:facet name="header"><h:outputText value="Make" /></f:facet> + <h:outputText value="#{sel.make}" /> + </rich:column> + <rich:column id="model"> + <f:facet name="header"><h:outputText value="Model" /></f:facet> + <h:inputText value=""/> + </rich:column> + <rich:column id="price"> + <f:facet name="header"><h:outputText value="Price" /></f:facet> + <h:outputText value="#{sel.price}" /> + </rich:column> + <rich:column id="mileage"> + <f:facet name="header"><h:outputText value="Mileage" /></f:facet> + <h:outputText value="#{sel.mileage}" /> + </rich:column> + <rich:column id="stock"> + <f:facet name="header"><h:outputText value="Stock" /></f:facet> + <h:inputText value=""/> + </rich:column> + </rich:dataTable> + </h:panelGroup> + </rich:modalPanel> +</ui:composition> Copied: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf7169.xhtml (from rev 23263, branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable2.xhtml) =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf7169.xhtml (rev 0) +++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable/examples/scrollableDataTable_rf7169.xhtml 2013-07-18 19:51:47 UTC (rev 23264) @@ -0,0 +1,96 @@ +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" + xmlns:f="http://java.sun.com/jsf/core" + xmlns:a4j="http://richfaces.org/a4j" + xmlns:rich="http://richfaces.org/rich"> + +<head> + <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8"/> + <title> + <ui:insert name="title"/> + </title> + <style type="text/css"> + .scrolls{ + width:300px; + height:200px; + overflow:auto; + } + </style> +</head> + <body> + <h:form> + <rich:spacer height="30" /> + <rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px" + width="400px" id="carList" rows="40" columnClasses="col" + value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single" + binding="#{dataTableScrollerBean.table}" + sortOrder="#{dataTableScrollerBean.order}" + selection="#{dataTableScrollerBean.selection}"> + + <rich:column id="make"> + <f:facet name="header"><h:outputText styleClass="headerText" value="Make" /></f:facet> + <h:outputText value="#{category.make}" /> + </rich:column> + <rich:column id="model"> + <f:facet name="header"><h:outputText styleClass="headerText" value="Model" /></f:facet> + <h:outputText value="#{category.model}" /> + <h:inputText value=""/> + </rich:column> + <rich:column id="price"> + <f:facet name="header"><h:outputText styleClass="headerText" value="Price" /></f:facet> + <h:outputText value="#{category.price}" /> + </rich:column> + <rich:column id="mileage"> + <f:facet name="header"><h:outputText styleClass="headerText" value="Mileage" /></f:facet> + <h:outputText value="#{category.mileage}" /> + </rich:column> + <rich:column width="200px" id="vin"> + <f:facet name="header"><h:outputText styleClass="headerText" value="VIN" /></f:facet> + <h:outputText value="#{category.vin}" /> + </rich:column> + <rich:column id="stock"> + <f:facet name="header"><h:outputText styleClass="headerText" value="Stock" /></f:facet> + <h:outputText value="#{category.stock}" /> + <h:inputText value=""/> + </rich:column> + </rich:scrollableDataTable> + <rich:spacer height="20px"/> + <a4j:commandButton value="Show Current Selection" reRender="table" + action="#{dataTableScrollerBean.takeSelection}" + oncomplete="javascript:Richfaces.showModalPanel('panel');"/> + </h:form> + <rich:modalPanel id="panel" autosized="false" keepVisualState="false" width="315" height="230"> + <f:facet name="header"> + <h:outputText value="Selected Rows"/> + </f:facet> + <f:facet name="controls"> + <span style="cursor:pointer" onclick="javascript:Richfaces.hideModalPanel('panel')">X</span> + </f:facet> + <h:panelGroup layout="block" styleClass="scrolls"> + <rich:dataTable value="#{dataTableScrollerBean.selectedCars}" var="sel" id="table"> + <rich:column> + <f:facet name="header"><h:outputText value="Make" /></f:facet> + <h:outputText value="#{sel.make}" /> + </rich:column> + <rich:column id="model"> + <f:facet name="header"><h:outputText value="Model" /></f:facet> + <h:inputText value=""/> + </rich:column> + <rich:column id="price"> + <f:facet name="header"><h:outputText value="Price" /></f:facet> + <h:outputText value="#{sel.price}" /> + </rich:column> + <rich:column id="mileage"> + <f:facet name="header"><h:outputText value="Mileage" /></f:facet> + <h:outputText value="#{sel.mileage}" /> + </rich:column> + <rich:column id="stock"> + <f:facet name="header"><h:outputText value="Stock" /></f:facet> + <h:inputText value=""/> + </rich:column> + </rich:dataTable> + </h:panelGroup> + </rich:modalPanel> + </body> +</html> Deleted: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable2.xhtml =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable2.xhtml 2013-07-12 07:48:19 UTC (rev 23263) +++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable2.xhtml 2013-07-18 19:51:47 UTC (rev 23264) @@ -1,96 +0,0 @@ -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core" - xmlns:a4j="http://richfaces.org/a4j" - xmlns:rich="http://richfaces.org/rich"> - -<head> - <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8"/> - <title> - <ui:insert name="title"/> - </title> - <style type="text/css"> - .scrolls{ - width:300px; - height:200px; - overflow:auto; - } - </style> -</head> - <body> - <h:form> - <rich:spacer height="30" /> - <rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px" - width="400px" id="carList" rows="40" columnClasses="col" - value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single" - binding="#{dataTableScrollerBean.table}" - sortOrder="#{dataTableScrollerBean.order}" - selection="#{dataTableScrollerBean.selection}"> - - <rich:column id="make"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Make" /></f:facet> - <h:outputText value="#{category.make}" /> - </rich:column> - <rich:column id="model"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Model" /></f:facet> - <h:outputText value="#{category.model}" /> - <h:inputText value=""/> - </rich:column> - <rich:column id="price"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Price" /></f:facet> - <h:outputText value="#{category.price}" /> - </rich:column> - <rich:column id="mileage"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Mileage" /></f:facet> - <h:outputText value="#{category.mileage}" /> - </rich:column> - <rich:column width="200px" id="vin"> - <f:facet name="header"><h:outputText styleClass="headerText" value="VIN" /></f:facet> - <h:outputText value="#{category.vin}" /> - </rich:column> - <rich:column id="stock"> - <f:facet name="header"><h:outputText styleClass="headerText" value="Stock" /></f:facet> - <h:outputText value="#{category.stock}" /> - <h:inputText value=""/> - </rich:column> - </rich:scrollableDataTable> - <rich:spacer height="20px"/> - <a4j:commandButton value="Show Current Selection" reRender="table" - action="#{dataTableScrollerBean.takeSelection}" - oncomplete="javascript:Richfaces.showModalPanel('panel');"/> - </h:form> - <rich:modalPanel id="panel" autosized="false" keepVisualState="false" width="315" height="230"> - <f:facet name="header"> - <h:outputText value="Selected Rows"/> - </f:facet> - <f:facet name="controls"> - <span style="cursor:pointer" onclick="javascript:Richfaces.hideModalPanel('panel')">X</span> - </f:facet> - <h:panelGroup layout="block" styleClass="scrolls"> - <rich:dataTable value="#{dataTableScrollerBean.selectedCars}" var="sel" id="table"> - <rich:column> - <f:facet name="header"><h:outputText value="Make" /></f:facet> - <h:outputText value="#{sel.make}" /> - </rich:column> - <rich:column id="model"> - <f:facet name="header"><h:outputText value="Model" /></f:facet> - <h:inputText value=""/> - </rich:column> - <rich:column id="price"> - <f:facet name="header"><h:outputText value="Price" /></f:facet> - <h:outputText value="#{sel.price}" /> - </rich:column> - <rich:column id="mileage"> - <f:facet name="header"><h:outputText value="Mileage" /></f:facet> - <h:outputText value="#{sel.mileage}" /> - </rich:column> - <rich:column id="stock"> - <f:facet name="header"><h:outputText value="Stock" /></f:facet> - <h:inputText value=""/> - </rich:column> - </rich:dataTable> - </h:panelGroup> - </rich:modalPanel> - </body> -</html>

11 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r23263 - in branches/enterprise/3.3.1.SP3_test_patch: ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: bleathem Date: 2013-07-12 03:48:19 -0400 (Fri, 12 Jul 2013) New Revision: 23263 Modified: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable2.xhtml branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js Log: BZ#982322: Moved the setScrollPos into the grid updateLayout method (RF-7169) Modified: branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable2.xhtml =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable2.xhtml 2013-07-12 07:19:12 UTC (rev 23262) +++ branches/enterprise/3.3.1.SP3_test_patch/samples/richfaces-demo/src/main/webapp/richfaces/scrollableDataTable2.xhtml 2013-07-12 07:48:19 UTC (rev 23263) @@ -1,24 +1,31 @@ -<ui:composition xmlns="http://www.w3.org/1999/xhtml" +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:rich="http://richfaces.org/rich"> - <style> - .scrolls{ - width:300px; - height:200px; - overflow:auto; - } - </style> +<head> + <meta http-equiv="Content-Type" content="text/xhtml; charset=UTF-8"/> + <title> + <ui:insert name="title"/> + </title> + <style type="text/css"> + .scrolls{ + width:300px; + height:200px; + overflow:auto; + } + </style> +</head> + <body> <h:form> <rich:spacer height="30" /> <rich:scrollableDataTable rowKeyVar="rkv" frozenColCount="1" height="400px" width="400px" id="carList" rows="40" columnClasses="col" value="#{dataTableScrollerBean.allCars}" var="category" sortMode="single" binding="#{dataTableScrollerBean.table}" - sortOrder="#{dataTableScrollerBean.order}" + sortOrder="#{dataTableScrollerBean.order}" selection="#{dataTableScrollerBean.selection}"> <rich:column id="make"> @@ -28,7 +35,7 @@ <rich:column id="model"> <f:facet name="header"><h:outputText styleClass="headerText" value="Model" /></f:facet> <h:outputText value="#{category.model}" /> - <h:inputText value=""/> + <h:inputText value=""/> </rich:column> <rich:column id="price"> <f:facet name="header"><h:outputText styleClass="headerText" value="Price" /></f:facet> @@ -45,44 +52,45 @@ <rich:column id="stock"> <f:facet name="header"><h:outputText styleClass="headerText" value="Stock" /></f:facet> <h:outputText value="#{category.stock}" /> - <h:inputText value=""/> + <h:inputText value=""/> </rich:column> - </rich:scrollableDataTable> - <rich:spacer height="20px"/> - <a4j:commandButton value="Show Current Selection" reRender="table" - action="#{dataTableScrollerBean.takeSelection}" - oncomplete="javascript:Richfaces.showModalPanel('panel');"/> + </rich:scrollableDataTable> + <rich:spacer height="20px"/> + <a4j:commandButton value="Show Current Selection" reRender="table" + action="#{dataTableScrollerBean.takeSelection}" + oncomplete="javascript:Richfaces.showModalPanel('panel');"/> </h:form> - <rich:modalPanel id="panel" autosized="false" keepVisualState="false" width="315" height="230"> - <f:facet name="header"> - <h:outputText value="Selected Rows"/> - </f:facet> - <f:facet name="controls"> - <span style="cursor:pointer" onclick="javascript:Richfaces.hideModalPanel('panel')">X</span> - </f:facet> + <rich:modalPanel id="panel" autosized="false" keepVisualState="false" width="315" height="230"> + <f:facet name="header"> + <h:outputText value="Selected Rows"/> + </f:facet> + <f:facet name="controls"> + <span style="cursor:pointer" onclick="javascript:Richfaces.hideModalPanel('panel')">X</span> + </f:facet> <h:panelGroup layout="block" styleClass="scrolls"> - <rich:dataTable value="#{dataTableScrollerBean.selectedCars}" var="sel" id="table"> - <rich:column> - <f:facet name="header"><h:outputText value="Make" /></f:facet> - <h:outputText value="#{sel.make}" /> - </rich:column> - <rich:column id="model"> - <f:facet name="header"><h:outputText value="Model" /></f:facet> - <h:inputText value=""/> - </rich:column> - <rich:column id="price"> - <f:facet name="header"><h:outputText value="Price" /></f:facet> - <h:outputText value="#{sel.price}" /> - </rich:column> - <rich:column id="mileage"> - <f:facet name="header"><h:outputText value="Mileage" /></f:facet> - <h:outputText value="#{sel.mileage}" /> - </rich:column> - <rich:column id="stock"> - <f:facet name="header"><h:outputText value="Stock" /></f:facet> - <h:inputText value=""/> - </rich:column> + <rich:dataTable value="#{dataTableScrollerBean.selectedCars}" var="sel" id="table"> + <rich:column> + <f:facet name="header"><h:outputText value="Make" /></f:facet> + <h:outputText value="#{sel.make}" /> + </rich:column> + <rich:column id="model"> + <f:facet name="header"><h:outputText value="Model" /></f:facet> + <h:inputText value=""/> + </rich:column> + <rich:column id="price"> + <f:facet name="header"><h:outputText value="Price" /></f:facet> + <h:outputText value="#{sel.price}" /> + </rich:column> + <rich:column id="mileage"> + <f:facet name="header"><h:outputText value="Mileage" /></f:facet> + <h:outputText value="#{sel.mileage}" /> + </rich:column> + <rich:column id="stock"> + <f:facet name="header"><h:outputText value="Stock" /></f:facet> + <h:inputText value=""/> + </rich:column> </rich:dataTable> - </h:panelGroup> + </h:panelGroup> </rich:modalPanel> -</ui:composition> + </body> +</html> Modified: branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js 2013-07-12 07:19:12 UTC (rev 23262) +++ branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js 2013-07-12 07:48:19 UTC (rev 23263) @@ -231,7 +231,6 @@ scrollElement.scrollTop--; } scrollElement.scrollTop = scrollTop; - grid.getBody().setScrollPos(scrollTop);//RF-7169 }, 50); } Modified: branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js =================================================================== --- branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2013-07-12 07:19:12 UTC (rev 23262) +++ branches/enterprise/3.3.1.SP3_test_patch/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridBody.js 2013-07-12 07:48:19 UTC (rev 23263) @@ -235,7 +235,12 @@ } var scrollPos = Math.min(totalWidth - viewWidth, scrollLeft); this.grid.adjustScrollPosition(scrollPos); - }, + + if (ClientUILib.isIE7 || ClientUILib.isIE8) { + this.setScrollPos(scrollTop);//RF-7169 + } + + }, adjustScrollPosition: function(pos) { this.templNormal.moveToX(-pos); },

11 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r23261 - in branches/community/3.3.X: cdk/generator and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc Date: 2013-07-11 10:04:09 -0400 (Thu, 11 Jul 2013) New Revision: 23261 Modified: branches/community/3.3.X/cdk/generator/pom.xml branches/community/3.3.X/docs/highlight/pom.xml branches/community/3.3.X/examples/photoalbum/pom.xml branches/community/3.3.X/examples/photoalbum/source/pom.xml branches/community/3.3.X/pom.xml branches/community/3.3.X/samples/glassX/pom.xml branches/community/3.3.X/samples/themes/pom.xml branches/community/3.3.X/samples/violetRays/pom.xml Log: fixing POMs so that they pass jboss staging rules Modified: branches/community/3.3.X/cdk/generator/pom.xml =================================================================== --- branches/community/3.3.X/cdk/generator/pom.xml 2013-07-11 13:49:10 UTC (rev 23260) +++ branches/community/3.3.X/cdk/generator/pom.xml 2013-07-11 14:04:09 UTC (rev 23261) @@ -20,6 +20,17 @@ <target>1.5</target> </configuration> </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> @@ -90,4 +101,4 @@ <version>2.8.1</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/community/3.3.X/docs/highlight/pom.xml =================================================================== --- branches/community/3.3.X/docs/highlight/pom.xml 2013-07-11 13:49:10 UTC (rev 23260) +++ branches/community/3.3.X/docs/highlight/pom.xml 2013-07-11 14:04:09 UTC (rev 23261) @@ -129,6 +129,21 @@ <version>0.95</version> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build>  -</project> \ No newline at end of file +</project> Modified: branches/community/3.3.X/examples/photoalbum/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/pom.xml 2013-07-11 13:49:10 UTC (rev 23260) +++ branches/community/3.3.X/examples/photoalbum/pom.xml 2013-07-11 14:04:09 UTC (rev 23261) @@ -6,6 +6,8 @@ <packaging>pom</packaging> <version>3.3.4-SNAPSHOT</version> <name>Photoalbum Demo Application Root</name> + <description>Photoalbum Demo Application Root</description> + <url>http://labs.jboss.com/jbossrichfaces</url> <modules> <module>source</module> @@ -40,6 +42,23 @@ </profile> </profiles> + <developers> + <developer> + <name>RichFaces committers</name> + </developer> + </developers> + + <licenses> + <license> + <name>LGPL 2.1</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + <distribution>repo</distribution> + <comments> + GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 + </comments> + </license> + </licenses> + <distributionManagement> <downloadUrl> http://labs.jboss.com/portal/jbossrichfaces/downloads @@ -55,5 +74,11 @@ <url>${snapshotRepository}</url> </snapshotRepository> </distributionManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/community/3.3.X</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/community/3.3.X</developerConnection> + <url>https://svn.jboss.org/repos/richfaces/branches/community/3.3.X</url> + </scm> </project> Modified: branches/community/3.3.X/examples/photoalbum/source/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/source/pom.xml 2013-07-11 13:49:10 UTC (rev 23260) +++ branches/community/3.3.X/examples/photoalbum/source/pom.xml 2013-07-11 14:04:09 UTC (rev 23261) @@ -9,6 +9,7 @@ <packaging>pom</packaging> <name>${appName}</name> <version>3.3.4-SNAPSHOT</version> + <url>http://labs.jboss.com/jbossrichfaces</url> <distributionManagement> <downloadUrl> @@ -135,4 +136,4 @@ </properties> </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: branches/community/3.3.X/pom.xml =================================================================== --- branches/community/3.3.X/pom.xml 2013-07-11 13:49:10 UTC (rev 23260) +++ branches/community/3.3.X/pom.xml 2013-07-11 14:04:09 UTC (rev 23261) @@ -5,6 +5,7 @@ <packaging>pom</packaging> <name>RichFaces project</name> <version>3.3.4-SNAPSHOT</version> + <description>RichFaces project root</description> <url>http://labs.jboss.com/jbossrichfaces</url> <dependencies /> <build> Modified: branches/community/3.3.X/samples/glassX/pom.xml =================================================================== --- branches/community/3.3.X/samples/glassX/pom.xml 2013-07-11 13:49:10 UTC (rev 23260) +++ branches/community/3.3.X/samples/glassX/pom.xml 2013-07-11 14:04:09 UTC (rev 23261) @@ -31,6 +31,17 @@ <target>1.5</target> </configuration> </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> Modified: branches/community/3.3.X/samples/themes/pom.xml =================================================================== --- branches/community/3.3.X/samples/themes/pom.xml 2013-07-11 13:49:10 UTC (rev 23260) +++ branches/community/3.3.X/samples/themes/pom.xml 2013-07-11 14:04:09 UTC (rev 23261) @@ -34,6 +34,17 @@ <target>1.5</target> </configuration> </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> Modified: branches/community/3.3.X/samples/violetRays/pom.xml =================================================================== --- branches/community/3.3.X/samples/violetRays/pom.xml 2013-07-11 13:49:10 UTC (rev 23260) +++ branches/community/3.3.X/samples/violetRays/pom.xml 2013-07-11 14:04:09 UTC (rev 23261) @@ -26,6 +26,17 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> @@ -75,4 +86,4 @@ <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project>

11 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r23260 - branches/community/3.3.X/examples/photoalbum.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc Date: 2013-07-11 09:49:10 -0400 (Thu, 11 Jul 2013) New Revision: 23260 Modified: branches/community/3.3.X/examples/photoalbum/pom.xml Log: added missing distributionManagement section Modified: branches/community/3.3.X/examples/photoalbum/pom.xml =================================================================== --- branches/community/3.3.X/examples/photoalbum/pom.xml 2013-07-11 11:28:57 UTC (rev 23259) +++ branches/community/3.3.X/examples/photoalbum/pom.xml 2013-07-11 13:49:10 UTC (rev 23260) @@ -39,5 +39,21 @@ </build> </profile> </profiles> + + <distributionManagement> + <downloadUrl> + http://labs.jboss.com/portal/jbossrichfaces/downloads + </downloadUrl> + <repository> + <id>repository.jboss.org</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> + </snapshotRepository> + </distributionManagement> -</project> \ No newline at end of file +</project>

11 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r23259 - tags.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc Date: 2013-07-11 07:28:57 -0400 (Thu, 11 Jul 2013) New Revision: 23259 Added: tags/3.3.4.Final/ Log: tagging 3.3.4.Final

11 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r23258 - in branches/community/release-3.3.4: cdk/generator and 6 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc Date: 2013-07-11 07:27:01 -0400 (Thu, 11 Jul 2013) New Revision: 23258 Modified: branches/community/release-3.3.4/cdk/generator/pom.xml branches/community/release-3.3.4/docs/highlight/pom.xml branches/community/release-3.3.4/examples/photoalbum/pom.xml branches/community/release-3.3.4/examples/photoalbum/source/pom.xml branches/community/release-3.3.4/pom.xml branches/community/release-3.3.4/samples/glassX/pom.xml branches/community/release-3.3.4/samples/themes/pom.xml branches/community/release-3.3.4/samples/violetRays/pom.xml Log: fixing POMs so that they pass jboss staging rules Modified: branches/community/release-3.3.4/cdk/generator/pom.xml =================================================================== --- branches/community/release-3.3.4/cdk/generator/pom.xml 2013-07-11 08:59:30 UTC (rev 23257) +++ branches/community/release-3.3.4/cdk/generator/pom.xml 2013-07-11 11:27:01 UTC (rev 23258) @@ -20,6 +20,17 @@ <target>1.5</target> </configuration> </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> @@ -90,4 +101,4 @@ <version>2.8.1</version> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/community/release-3.3.4/docs/highlight/pom.xml =================================================================== --- branches/community/release-3.3.4/docs/highlight/pom.xml 2013-07-11 08:59:30 UTC (rev 23257) +++ branches/community/release-3.3.4/docs/highlight/pom.xml 2013-07-11 11:27:01 UTC (rev 23258) @@ -129,6 +129,21 @@ <version>0.95</version> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build>  -</project> \ No newline at end of file +</project> Modified: branches/community/release-3.3.4/examples/photoalbum/pom.xml =================================================================== --- branches/community/release-3.3.4/examples/photoalbum/pom.xml 2013-07-11 08:59:30 UTC (rev 23257) +++ branches/community/release-3.3.4/examples/photoalbum/pom.xml 2013-07-11 11:27:01 UTC (rev 23258) @@ -6,6 +6,8 @@ <packaging>pom</packaging> <version>3.3.4.Final</version> <name>Photoalbum Demo Application Root</name> + <description>Photoalbum Demo Application Root</description> + <url>http://labs.jboss.com/jbossrichfaces</url> <modules> <module>source</module> @@ -40,6 +42,23 @@ </profile> </profiles> + <developers> + <developer> + <name>RichFaces committers</name> + </developer> + </developers> + + <licenses> + <license> + <name>LGPL 2.1</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + <distribution>repo</distribution> + <comments> + GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 + </comments> + </license> + </licenses> + <distributionManagement> <downloadUrl> http://labs.jboss.com/portal/jbossrichfaces/downloads @@ -55,5 +74,11 @@ <url>${snapshotRepository}</url> </snapshotRepository> </distributionManagement> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/branches/community/3.3.X</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/branches/community/3.3.X</developerConnection> + <url>https://svn.jboss.org/repos/richfaces/branches/community/3.3.X</url> + </scm> </project> Modified: branches/community/release-3.3.4/examples/photoalbum/source/pom.xml =================================================================== --- branches/community/release-3.3.4/examples/photoalbum/source/pom.xml 2013-07-11 08:59:30 UTC (rev 23257) +++ branches/community/release-3.3.4/examples/photoalbum/source/pom.xml 2013-07-11 11:27:01 UTC (rev 23258) @@ -9,6 +9,7 @@ <packaging>pom</packaging> <name>${appName}</name> <version>3.3.4.Final</version> + <url>http://labs.jboss.com/jbossrichfaces</url> <distributionManagement> <downloadUrl> @@ -141,4 +142,4 @@ </properties> </profile> </profiles> -</project> \ No newline at end of file +</project> Modified: branches/community/release-3.3.4/pom.xml =================================================================== --- branches/community/release-3.3.4/pom.xml 2013-07-11 08:59:30 UTC (rev 23257) +++ branches/community/release-3.3.4/pom.xml 2013-07-11 11:27:01 UTC (rev 23258) @@ -5,6 +5,7 @@ <packaging>pom</packaging> <name>RichFaces project</name> <version>3.3.4.Final</version> + <description>RichFaces project root</description> <url>http://labs.jboss.com/jbossrichfaces</url> <properties> <snapshotRepository> Modified: branches/community/release-3.3.4/samples/glassX/pom.xml =================================================================== --- branches/community/release-3.3.4/samples/glassX/pom.xml 2013-07-11 08:59:30 UTC (rev 23257) +++ branches/community/release-3.3.4/samples/glassX/pom.xml 2013-07-11 11:27:01 UTC (rev 23258) @@ -31,6 +31,17 @@ <target>1.5</target> </configuration> </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> @@ -75,4 +86,4 @@ <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project> Modified: branches/community/release-3.3.4/samples/themes/pom.xml =================================================================== --- branches/community/release-3.3.4/samples/themes/pom.xml 2013-07-11 08:59:30 UTC (rev 23257) +++ branches/community/release-3.3.4/samples/themes/pom.xml 2013-07-11 11:27:01 UTC (rev 23258) @@ -34,6 +34,17 @@ <target>1.5</target> </configuration> </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> Modified: branches/community/release-3.3.4/samples/violetRays/pom.xml =================================================================== --- branches/community/release-3.3.4/samples/violetRays/pom.xml 2013-07-11 08:59:30 UTC (rev 23257) +++ branches/community/release-3.3.4/samples/violetRays/pom.xml 2013-07-11 11:27:01 UTC (rev 23258) @@ -26,6 +26,17 @@ </execution> </executions> </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> @@ -75,4 +86,4 @@ <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project>

11 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r23257 - branches/community/release-3.3.4/examples/photoalbum.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc Date: 2013-07-11 04:59:30 -0400 (Thu, 11 Jul 2013) New Revision: 23257 Modified: branches/community/release-3.3.4/examples/photoalbum/pom.xml Log: added missing distributionManagement section Modified: branches/community/release-3.3.4/examples/photoalbum/pom.xml =================================================================== --- branches/community/release-3.3.4/examples/photoalbum/pom.xml 2013-07-11 07:09:51 UTC (rev 23256) +++ branches/community/release-3.3.4/examples/photoalbum/pom.xml 2013-07-11 08:59:30 UTC (rev 23257) @@ -39,5 +39,21 @@ </build> </profile> </profiles> + + <distributionManagement> + <downloadUrl> + http://labs.jboss.com/portal/jbossrichfaces/downloads + </downloadUrl> + <repository> + <id>repository.jboss.org</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> + <snapshotRepository> + <id>snapshots.jboss.org</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> + </snapshotRepository> + </distributionManagement> -</project> \ No newline at end of file +</project>

11 years, 5 months

1
0
0 / 0

JBoss Rich Faces SVN: r23256 - tags.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc Date: 2013-07-11 03:09:51 -0400 (Thu, 11 Jul 2013) New Revision: 23256 Removed: tags/3.3.4.Final/ Log: deleting 3.3.4.Final tag for, working in community/release-3.3.4 branch instead

11 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits July 2013