May 2007 - richfaces-svn-commits - Jboss List Archives

JBoss Rich Faces SVN: r827 - in trunk: richfaces/separator/src/main/templates and 2 other directories.

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

Author: nbelaevski Date: 2007-05-21 18:12:23 -0400 (Mon, 21 May 2007) New Revision: 827 Added: trunk/richfaces-samples/separator-sample/pom.xml Modified: trunk/richfaces-samples/pom.xml trunk/richfaces-samples/separator-sample/ trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java trunk/richfaces/separator/src/main/templates/separator.jspx Log: RF-200 fixed Modified: trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java =================================================================== --- trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java 2007-05-21 15:39:52 UTC (rev 826) +++ trunk/richfaces/separator/src/main/java/org/richfaces/renderkit/html/SeparatorRendererBase.java 2007-05-21 22:12:23 UTC (rev 827) @@ -24,6 +24,7 @@ import org.ajax4jsf.framework.renderer.RendererBase; import org.ajax4jsf.framework.util.HtmlDimensions; +import org.ajax4jsf.framework.util.style.CSSFormat; import org.richfaces.component.UISeparator; import org.richfaces.renderkit.html.images.BevelSeparatorImage; import org.richfaces.renderkit.html.images.SimpleSeparatorImage; @@ -98,6 +99,11 @@ } else { uri = getResource(SimpleSeparatorImage.class.getName()).getUri(context, component); } + + if (uri != null) { + uri = CSSFormat.url(uri); + } + return uri; } Modified: trunk/richfaces/separator/src/main/templates/separator.jspx =================================================================== --- trunk/richfaces/separator/src/main/templates/separator.jspx 2007-05-21 15:39:52 UTC (rev 826) +++ trunk/richfaces/separator/src/main/templates/separator.jspx 2007-05-21 22:12:23 UTC (rev 827) @@ -13,7 +13,7 @@ <div id="#{clientId}" align="#{component.attributes['align']}" style="font-size: 0px;" x:passThruWithExclusions="id,width,height,style,class"> <div style="width: #{this:getWidth(context, component)}; height: #{this:getHeight(context, component)}; - background-image: url(#{this:backgroundImage(context, component)}); background-repeat: repeat-x; + background-image: #{this:backgroundImage(context, component)}; background-repeat: repeat-x; background-position:center; #{component.attributes['style']}" class="rich-separator #{component.attributes['styleClass']}"/> </div> Modified: trunk/richfaces-samples/pom.xml =================================================================== --- trunk/richfaces-samples/pom.xml 2007-05-21 15:39:52 UTC (rev 826) +++ trunk/richfaces-samples/pom.xml 2007-05-21 22:12:23 UTC (rev 827) @@ -1,285 +1,286 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-samples</artifactId> - <packaging>pom</packaging> - <name>RichFaces Components Examples</name> - <version>3.0.1-SNAPSHOT</version> - <url>http://labs.jboss.com/jbossrichfaces/samples</url> - <properties> - <org.ajax4jsf.version>1.1.1-SNAPSHOT</org.ajax4jsf.version> - </properties> -  - <build> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> -  - <configuration> - <scanIntervalSeconds>10</scanIntervalSeconds> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8080</port> - <maxIdleTime>60000</maxIdleTime> - </connector> - </connectors> - </configuration> - - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - <executions> - <execution> - <id>surefire-it</id> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>${org.ajax4jsf.version}</version> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.12</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - <scope>runtime</scope> - </dependency> - </dependencies> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/</developerConnection> - <url>http://anonsvn.jboss.org/repos/richfaces/</url> - </scm> - - <distributionManagement> - <downloadUrl>http://labs.jboss.com/portal/jbossrichfaces/downloads</downloadUrl> - <repository> - <id>release-repository</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>snap-repository</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> - <site> - <id>richfaces-samples-site</id> - <url>richfaces-samples/</url> - </site> - </distributionManagement> - <repositories> - <repository> - <releases /> - <snapshots> - <enabled>false</enabled> - <updatePolicy>never</updatePolicy> - </snapshots> - <id>maven-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url> - https://maven-repository.dev.java.net/nonav/repository - </url> - <layout>legacy</layout> - </repository> - <repository> - <releases> - <enabled>false</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - <updatePolicy>always</updatePolicy> - </snapshots> - <id>maven.exadel.com</id> - <name>Jboss Repository for Maven Snapshots</name> - <url>http://maven.exadel.com/</url> - </repository> - </repositories> - <profiles> - <profile> - <id>jsf1_1</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>jsfVersion</name> - <value>1.1</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf1_2</id> - <build> - <defaultGoal>jetty:run</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_03</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>myfaces</id> - <properties> - <myfaces>1.1.5</myfaces> - <tomahawk>1.1.5</tomahawk> - </properties> - <build> - <plugins /> - </build> - <dependencies> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>${org.ajax4jsf.version}</version> - <exclusions> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-api</artifactId> - <version>${myfaces}</version> - </dependency> - <dependency> - <groupId>org.apache.myfaces.core</groupId> - <artifactId>myfaces-impl</artifactId> - <version>${myfaces}</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - </profiles> - <modules> - <module>panel-sample</module> - <module>gmap-sample</module> - <module>togglePanel-sample</module> - <module>tabPanelDemo</module> - <module>simpleTogglePanel-sample</module> - <module>inputNumberSpinnerDemo</module> - <module>inputNumberSliderDemo</module> - <module>panelbar-sample</module> - <module>toolBarDemo</module> - <module>tree-demo</module> - <module>dataFilterSliderDemo</module> - <module>suggestionbox-sample</module> - <module>dragDropDemo</module> - <module>dataTableDemo</module> - <module>skins</module> - <module>modalpanel-sample</module> - <module>datascroller-sample</module> - <module>richfaces-demo</module> - <module>dropdownmenu-sample</module> - </modules> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-samples</artifactId> + <packaging>pom</packaging> + <name>RichFaces Components Examples</name> + <version>3.0.1-SNAPSHOT</version> + <url>http://labs.jboss.com/jbossrichfaces/samples</url> + <properties> + <org.ajax4jsf.version>1.1.1-SNAPSHOT</org.ajax4jsf.version> + </properties> +  + <build> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>maven-jetty-plugin</artifactId> +  + <configuration> + <scanIntervalSeconds>10</scanIntervalSeconds> + <connectors> + <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> + <port>8080</port> + <maxIdleTime>60000</maxIdleTime> + </connector> + </connectors> + </configuration> + + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + <executions> + <execution> + <id>surefire-it</id> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <version>${org.ajax4jsf.version}</version> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.12</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + <scope>runtime</scope> + </dependency> + </dependencies> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/</developerConnection> + <url>http://anonsvn.jboss.org/repos/richfaces/</url> + </scm> + + <distributionManagement> + <downloadUrl>http://labs.jboss.com/portal/jbossrichfaces/downloads</downloadUrl> + <repository> + <id>release-repository</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> + <snapshotRepository> + <id>snap-repository</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> + </snapshotRepository> + <site> + <id>richfaces-samples-site</id> + <url>richfaces-samples/</url> + </site> + </distributionManagement> + <repositories> + <repository> + <releases /> + <snapshots> + <enabled>false</enabled> + <updatePolicy>never</updatePolicy> + </snapshots> + <id>maven-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url> + https://maven-repository.dev.java.net/nonav/repository + </url> + <layout>legacy</layout> + </repository> + <repository> + <releases> + <enabled>false</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + <updatePolicy>always</updatePolicy> + </snapshots> + <id>maven.exadel.com</id> + <name>Jboss Repository for Maven Snapshots</name> + <url>http://maven.exadel.com/</url> + </repository> + </repositories> + <profiles> + <profile> + <id>jsf1_1</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>jsfVersion</name> + <value>1.1</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <build> + <defaultGoal>jetty:run</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_03</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_03</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>myfaces</id> + <properties> + <myfaces>1.1.5</myfaces> + <tomahawk>1.1.5</tomahawk> + </properties> + <build> + <plugins /> + </build> + <dependencies> + <dependency> + <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <version>${org.ajax4jsf.version}</version> + <exclusions> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> + <version>${myfaces}</version> + </dependency> + <dependency> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> + <version>${myfaces}</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + </profiles> + <modules> + <module>separator-sample</module> + <module>panel-sample</module> + <module>gmap-sample</module> + <module>togglePanel-sample</module> + <module>tabPanelDemo</module> + <module>simpleTogglePanel-sample</module> + <module>inputNumberSpinnerDemo</module> + <module>inputNumberSliderDemo</module> + <module>panelbar-sample</module> + <module>toolBarDemo</module> + <module>tree-demo</module> + <module>dataFilterSliderDemo</module> + <module>suggestionbox-sample</module> + <module>dragDropDemo</module> + <module>dataTableDemo</module> + <module>skins</module> + <module>modalpanel-sample</module> + <module>datascroller-sample</module> + <module>richfaces-demo</module> + <module>dropdownmenu-sample</module> + </modules> </project> \ No newline at end of file Property changes on: trunk/richfaces-samples/separator-sample ___________________________________________________________________ Name: svn:ignore + .classpath .project .settings target Added: trunk/richfaces-samples/separator-sample/pom.xml =================================================================== --- trunk/richfaces-samples/separator-sample/pom.xml (rev 0) +++ trunk/richfaces-samples/separator-sample/pom.xml 2007-05-21 22:12:23 UTC (rev 827) @@ -0,0 +1,32 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <artifactId>richfaces-samples</artifactId> + <groupId>org.richfaces</groupId> + <version>3.0.1-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces</groupId> + <artifactId>separator-sample</artifactId> + <packaging>war</packaging> + <name>webapp Maven Webapp</name> + <build> + <finalName>separator-sample</finalName> + </build> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>separator</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>skins</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> \ No newline at end of file

17 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r826 - trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html.

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

Author: abelevich Date: 2007-05-21 11:39:52 -0400 (Mon, 21 May 2007) New Revision: 826 Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java Log: Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java =================================================================== --- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-05-21 15:39:43 UTC (rev 825) +++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-05-21 15:39:52 UTC (rev 826) @@ -190,10 +190,11 @@ writer.startElement(HTML.SPAN_ELEM, column); String columnWidth = (String)column.getAttributes().get("width"); - String cell_id = state.getClientId() + ":" + CELL_ID_PREFFIX+ state.getRowIndex()+ "_" + state.getCellIndex(); + String cell_id = state.getClientId() + ":" + CELL_ID_PREFFIX + state.getRowIndex()+ "_" + state.getCellIndex(); getUtils().writeAttribute(writer, "id",cell_id); getUtils().writeAttribute(writer, "class", "ClientUI_Grid_BCBody"); getUtils().writeAttribute(writer, "style", "width:" + columnWidth); + System.out.println("rendering cell: " + cell_id); renderChildren(context, column); writer.endElement(HTML.SPAN_ELEM); AjaxContext ajaxContext = state.getAjaxContext(); @@ -216,6 +217,7 @@ } }; + protected String getJavaScriptVarName(FacesContext context, UIScrollableGrid grid) { String id = grid.getBaseClientId(context); return "Richfaces_ScrollableGrid_" + id.replaceAll("[^A-Za-z0-9_]", "_"); @@ -326,6 +328,11 @@ grid.setRow_count(new Integer(Integer.parseInt(values[0]))); grid.setDataIndex(new Integer(Integer.parseInt(values[1]))); grid.setStartRow(new Integer(Integer.parseInt(values[2]))); + + System.out.println("row count: " + grid.getRow_count()); + System.out.println("data index: " + grid.getDataIndex()); + System.out.println("start row: " + grid.getStartRow()); + grid.queueEvent(new AjaxEvent(grid)); }

17 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r825 - trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces.

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

Author: abelevich Date: 2007-05-21 11:39:43 -0400 (Mon, 21 May 2007) New Revision: 825 Modified: trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx Log: Modified: trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx =================================================================== --- trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-05-21 15:06:42 UTC (rev 824) +++ trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-05-21 15:39:43 UTC (rev 825) @@ -62,7 +62,7 @@ <div id="#{clientId}_GridBodyTemplate" class="ClientUI_InlineBox" style="overflow: auto; width: #{component.attributes['width']}; height: #{component.attributes['height']};"> <div style="display: block; width: #{sumWidth}px;"> - <span class="ClientUI_TmplBox" id="FrozenBox"> + <span class="ClientUI_TmplBox" id="#{clientId}:body:FrozenBox"> <table cellpadding="0" cellspacing="0"> <tbody> <jsp:scriptlet> @@ -73,7 +73,7 @@ </tbody> </table> </span> - <span class="ClientUI_TmplBox" id="NormalBox"> + <span class="ClientUI_TmplBox" id="#{clientId}:body:NormalBox"> <table cellpadding="0" cellspacing="0"> <tbody> <jsp:scriptlet>

17 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r824 - in trunk/richfaces/dropdown-menu/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.

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

Author: a.izobov Date: 2007-05-21 11:06:42 -0400 (Mon, 21 May 2007) New Revision: 824 Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx Log: RF-190,159,141 fixed Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss =================================================================== --- trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-05-21 14:51:49 UTC (rev 823) +++ trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/css/dropdownmenu.xcss 2007-05-21 15:06:42 UTC (rev 824) @@ -19,16 +19,16 @@ background : url(menu_list_bg.gif) repeat-y left; } .dr-menu-label { + left: 0px; + top: 0px; padding : 2px 5px 2px 5px; white-space : nowrap; - position: relative; width : auto; - height : 100%; + height : auto; } .dr-menu-label-unselect { - border : 1px solid transparent; - _border-color:tomato;/*For IE6-*/ - _filter:chroma(color=tomato);/*For IE6-*/ + border : 0px solid transparent; + padding : 3px 6px; } .dr-menu-label-select { border : 1px solid #bfbfc0; Modified: trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js =================================================================== --- trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2007-05-21 14:51:49 UTC (rev 823) +++ trunk/richfaces/dropdown-menu/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2007-05-21 15:06:42 UTC (rev 824) @@ -27,6 +27,14 @@ } // if } +Exadel.Menu.removePx = function(e) { + if ((e+"").indexOf("px")!=-1) + return (e+"").substring(0,e.length-2); + else + return e; +} + + Exadel.Menu.Layers = { listl: new Array(), father: {}, @@ -126,17 +134,16 @@ //alert(navigator.userAgent); if(this.IE || this.NS) { menuName = $(menuName).id; + var menu = $(menuName); var iframe = $(menuName + "_iframe"); var nsfix = (this.NS ? 7 : 0); if(on){ - Position.clone(menuName, iframe); - var dim = Element.getDimensions(iframe); - iframe.style.top = (iframe.style.pixelTop + Math.round(this.CornerRadius / 2)) + "px"; - iframe.style.left = (iframe.offsetLeft) + "px"; - iframe.style.width = (dim.width - this.shadowWidth - nsfix) + "px"; + var dim = Element.getDimensions(menu); + iframe.style.top = menu.style.top; + iframe.style.left = menu.style.left; + iframe.style.width = menu.offsetWidth + "px" + iframe.style.height = menu.offsetHeight + "px" iframe.style.visibility = "visible"; - iframe.style.height = (dim.height - this.CornerRadius - 1 - this.shadowWidth - nsfix) + "px"; - } else { iframe.style.visibility = "hidden"; } @@ -195,7 +202,7 @@ } // if tmpLayer.style.visibility = 'hidden'; - tmpLayer.style.left = "-"+tmpLayer.clientWidth; +// tmpLayer.style.left = "-"+tmpLayer.clientWidth; // Element.hide(tmpLayer); } // else }, @@ -461,8 +468,14 @@ // screenOffset[1] = 0; // } var screenOffset = Position.positionedOffset(this.element); + var innerDiv = this.element.lastChild; var dim = Element.getDimensions(this.element); - + + var parOffset = Position.cumulativeOffset(this.element); + var divOffset = Position.cumulativeOffset(innerDiv); + var deltaX = divOffset[0] - parOffset[0]; + var deltaY = divOffset[1] - parOffset[1]; + // parent element this.top = screenOffset[1]; this.left = screenOffset[0]; @@ -510,8 +523,10 @@ if (!foundPos) { layerPos = this.calcPosition(listPos[0].jointPoint, listPos[0].direction) } - this.layer.style.left = layerPos.left + hOffset - this.left + "px"; - this.layer.style.top = layerPos.top + vOffset - this.top + "px"; + this.layer.style.left = layerPos.left + hOffset - deltaX - this.left + "px"; + this.layer.style.top = layerPos.top + vOffset - deltaY - this.top + "px"; + + this.layer.style.width = this.layer.clientWidth + "px"; Exadel.Menu.Layers.LMPopUp(this.layer.id, false); Exadel.Menu.Layers.clearLMTO(); @@ -531,9 +546,10 @@ this.layer = $(layer); this.show = function() { - if (!Exadel.Menu.Layers.isVisible(this.layer)){ - this.reposition(); - Exadel.Menu.Layers.LMPopUp(this.layer, false); + if (!Exadel.Menu.Layers.isVisible(this.layer) && + Exadel.Menu.Layers.isVisible(Exadel.Menu.Layers.father[this.layer.id])) { + this.reposition(); + Exadel.Menu.Layers.LMPopUp(this.layer, false); } }.bind(this); } @@ -544,9 +560,10 @@ var windowWidth = body.width; var scrolls = {top:0, left:0}; var screenOffset = Position.positionedOffset(this.element); - var screenOffsetParent = Position.positionedOffset(this.element.parentNode.parentNode); - screenOffset[0]+=screenOffsetParent[0]; - screenOffset[1]+=screenOffsetParent[1]; + var leftPx = Exadel.Menu.removePx(this.element.parentNode.parentNode.style.left); + var topPx = Exadel.Menu.removePx(this.element.parentNode.parentNode.style.top); + screenOffset[0]+=Number(leftPx); + screenOffset[1]+=Number(topPx); var cumulativeOffset = Position.cumulativeOffset(this.element); var labelOffset = [cumulativeOffset[0] - screenOffset[0], cumulativeOffset[1] - screenOffset[1]]; var dim = Element.getDimensions(this.element); @@ -562,7 +579,7 @@ dir = options.direction.toUpperCase().indexOf('LEFT')!=-1?1:dir; dir = options.direction.toUpperCase().indexOf('RIGHT')!=-1?2:dir; } - + var layerLeft = right; var layerTop = top; @@ -629,6 +646,9 @@ this.layer.style.left = layerLeft + "px"; this.layer.style.top = layerTop + "px"; + + this.layer.style.width = this.layer.clientWidth + "px"; + } /** * set to true when a dropdown box inside menu receives focus @@ -663,7 +683,7 @@ Exadel.Menu.MouseIn=true; Exadel.Menu.Layers.clearLMTO(); - var menuNode = this.layer.parentNode; + var menuNode = this.layer.parentNode.parentNode; menuNode.className='dr-menu-label dr-menu-label-select rich-ddmenu-label rich-ddmenu-label-select'; Event.stop(e); @@ -675,7 +695,7 @@ if (!Exadel.Menu.selectOpen) { Exadel.Menu.Layers.setLMTO(this.hideDelay); } - var menuNode = this.layer.parentNode; + var menuNode = this.layer.parentNode.parentNode; menuNode.className='dr-menu-label dr-menu-label-unselect rich-ddmenu-label rich-ddmenu-label-unselect'; Event.stop(e); @@ -829,15 +849,15 @@ closeMinors: function(id){ //LOG.a4j_debug('closeMinors ' + this.id +' ' +this.level); var item = this.items[id]; - if(!item.childMenu){ +// if(!item.childMenu){ //LOG.a4j_debug('hiding menus ' + this.id +' ' +this.level); - for(var i = this.level + 1; i < Exadel.Menu.Layers.levels.length; i++){ + for(var i = this.level + (!item.childMenu?1:2); i < Exadel.Menu.Layers.levels.length; i++){ if(Exadel.Menu.Layers.levels[i]) { //LOG.a4j_debug('hide ' +Exadel.Menu.Layers.levels[i]); Exadel.Menu.Layers.levels[i].hideMe(); } } - } +// } if (item.menu.refItem) { item.menu.refItem.highLightGroup(true); } Modified: trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx =================================================================== --- trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-05-21 14:51:49 UTC (rev 823) +++ trunk/richfaces/dropdown-menu/src/main/templates/org/richfaces/htmlDropDownMenu.jspx 2007-05-21 15:06:42 UTC (rev 824) @@ -14,7 +14,7 @@ <h:scripts> new org.ajax4jsf.framework.resource.PrototypeScript(), new org.ajax4jsf.framework.ajax.AjaxScript(), - scripts/menu.js + scripts/menu.js </h:scripts> <f:clientid var="clientId"/> @@ -42,9 +42,11 @@ <![CDATA[}]]> </jsp:scriptlet> + <div style="margin: 0px; padding: 0px; border: 0px; position: relative;"> <vcp:body> <f:call name="renderChildren" /> </vcp:body> + </div> </div>

17 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r823 - trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit.

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

Author: dbiatenia Date: 2007-05-21 10:51:49 -0400 (Mon, 21 May 2007) New Revision: 823 Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java Log: Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java =================================================================== --- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-21 14:25:24 UTC (rev 822) +++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-21 14:51:49 UTC (rev 823) @@ -256,25 +256,12 @@ buffer.append(",false"); } } else { - PanelMenuRendererBase renderer = (PanelMenuRendererBase) context.getRenderKit().getRenderer(child.getFamily(), child.getRendererType()); - try { - value = renderer.isOpened(context, child); - if (value.equals("opened")) { - buffer.append(",true"); - } else { - buffer.append(",false"); - } - } catch (IOException e) { - buffer.append(",false"); - } -/* dbiatenia 2007/05/21 Object property = child.getAttributes().get("expanded"); - if (property!=null&&property.equals("true")){ + if (property!=null && property.toString().equals("true")){ buffer.append(",true"); } else { buffer.append(",false"); } -*/ } }

17 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r822 - trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit.

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

Author: dbiatenia Date: 2007-05-21 10:25:24 -0400 (Mon, 21 May 2007) New Revision: 822 Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java Log: Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java =================================================================== --- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-21 13:21:18 UTC (rev 821) +++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-21 14:25:24 UTC (rev 822) @@ -256,12 +256,25 @@ buffer.append(",false"); } } else { + PanelMenuRendererBase renderer = (PanelMenuRendererBase) context.getRenderKit().getRenderer(child.getFamily(), child.getRendererType()); + try { + value = renderer.isOpened(context, child); + if (value.equals("opened")) { + buffer.append(",true"); + } else { + buffer.append(",false"); + } + } catch (IOException e) { + buffer.append(",false"); + } +/* dbiatenia 2007/05/21 Object property = child.getAttributes().get("expanded"); if (property!=null&&property.equals("true")){ buffer.append(",true"); } else { buffer.append(",false"); } +*/ } }

17 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r821 - trunk/richfaces/togglePanel/src/main/config/component.

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

Author: A.Skokov Date: 2007-05-21 09:21:18 -0400 (Mon, 21 May 2007) New Revision: 821 Modified: trunk/richfaces/togglePanel/src/main/config/component/togglePanel.xml Log: http://jira.jboss.com/jira/browse/RF-151 fixed Modified: trunk/richfaces/togglePanel/src/main/config/component/togglePanel.xml =================================================================== --- trunk/richfaces/togglePanel/src/main/config/component/togglePanel.xml 2007-05-21 13:16:52 UTC (rev 820) +++ trunk/richfaces/togglePanel/src/main/config/component/togglePanel.xml 2007-05-21 13:21:18 UTC (rev 821) @@ -90,6 +90,11 @@ A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator. </description> </property> + <property hidden="true"> + <name>localValueSet</name> + <classname>boolean</classname> + </property> + <!-- <taghandler> <classname>org.ajax4jsf.tag.TestHandler</classname> @@ -345,10 +350,6 @@ 0 and 32767 </description> </property> - <property hidden="true"> - <name>localValueSet</name> - <classname>java.lang.String</classname> - </property> <!-- AJAX component attributes

17 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r820 - trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts.

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

Author: sergeyhalipov Date: 2007-05-21 09:16:52 -0400 (Mon, 21 May 2007) New Revision: 820 Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js Log: Panel menu: JavaScript API for end-developers, doExpand(), doCollapse(). Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js =================================================================== --- trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-05-21 12:58:33 UTC (rev 819) +++ trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-05-21 13:16:52 UTC (rev 820) @@ -287,7 +287,7 @@ } }; -Richfaces.doExpand = function (id) { +PanelMenu.doExpand = function (id) { var group = PanelMenuStorage[id]; if (group && group.type && "node" == group.type) { var parent = group.parentObj; @@ -308,7 +308,7 @@ } } -Richfaces.doCollapse = function (id) { +PanelMenu.doCollapse = function (id) { var group = PanelMenuStorage[id]; if (group && group.type && "node" == group.type) { if (group.expanded && new Function(group.onclose+";return true;")()){

17 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r819 - trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts.

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

Author: sergeyhalipov Date: 2007-05-21 08:58:33 -0400 (Mon, 21 May 2007) New Revision: 819 Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js Log: Panel menu: JavaScript API for end-developers, doExpand(), doCollapse(). Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js =================================================================== --- trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-05-21 12:04:05 UTC (rev 818) +++ trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-05-21 12:58:33 UTC (rev 819) @@ -285,4 +285,34 @@ Event.observe(this.obj, "mouseover", this.addHoverStyles.bindAsEventListener(this), false); Event.observe(this.obj, "mouseout", this.removeHoverStyles.bindAsEventListener(this), false); } -}; \ No newline at end of file +}; + +Richfaces.doExpand = function (id) { + var group = PanelMenuStorage[id]; + if (group && group.type && "node" == group.type) { + var parent = group.parentObj; + if (parent.expandSingle){ + if (group.parentObj.lastExpanded!=null){ + group.parentObj.lastExpanded.collapse(); + } + } + while (parent) { + if (parent.type && "node" == parent.type) { + parent.expand(); + } + parent = parent.parentObj; + } + if (!group.expanded && new Function(group.onopen+";return true;")()){ + group.expand(); + } + } +} + +Richfaces.doCollapse = function (id) { + var group = PanelMenuStorage[id]; + if (group && group.type && "node" == group.type) { + if (group.expanded && new Function(group.onclose+";return true;")()){ + group.collapse(); + } + } +} \ No newline at end of file

17 years, 7 months

1
0
0 / 0

JBoss Rich Faces SVN: r818 - in trunk/richfaces/panelmenu/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directory.

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

Author: sergeyhalipov Date: 2007-05-21 08:04:05 -0400 (Mon, 21 May 2007) New Revision: 818 Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js Log: Fix expandSingle behaviour. Modified: trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java =================================================================== --- trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-21 11:21:27 UTC (rev 817) +++ trunk/richfaces/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRenderer.java 2007-05-21 12:04:05 UTC (rev 818) @@ -60,21 +60,15 @@ List flatList = new LinkedList(); Map levels = new HashMap(); - Object singleOpen = component.getAttributes().get("singleOpen"); + boolean expandSingle = ((UIPanelMenu)component).isExpandSingle(); - if (singleOpen!=null){ - singleOpen = singleOpen.toString(); - } else { - singleOpen = "false"; - } - flatten(component.getChildren(), flatList, levels, 0); panelMenu .append("new PanelMenu('") .append(component.getClientId(context).toString()) .append("',") - .append(singleOpen.toString()) + .append(new Boolean(expandSingle).toString()) .append(");\n"); String iconPosition = ((UIPanelMenu)component).getIconItemPosition(); String iconPositionTopLevel = ((UIPanelMenu)component).getIconItemTopPosition(); Modified: trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js =================================================================== --- trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-05-21 11:21:27 UTC (rev 817) +++ trunk/richfaces/panelmenu/src/main/resources/org/richfaces/renderkit/html/scripts/panelMenu.js 2007-05-21 12:04:05 UTC (rev 818) @@ -11,7 +11,7 @@ PanelMenu.prototype = { initialize: function(myId,so){ this.childObj = new Array(); - this.SingleOpen = so; + this.expandSingle = so; this.lastExpanded = null; this.is = 'panelMenu'; PanelMenuStorage[myId] = this;}}; @@ -33,6 +33,14 @@ this.childObj = new Array(); this.parentObj = PanelMenuStorage[ids.parentId]; this.parentObj.childObj.push(this); + var parent = this.parentObj; + while (parent) { + if (parent.is && "panelMenu" == parent.is) { + this.expandSingle = parent.expandSingle; + break; + } + parent = parent.parentObj; + } this.obj = $(ids.myId); this.content = this._getDirectChildrenByTag(this.obj,"TD")[level+1]; this.iconAlign = iconAlign; @@ -60,8 +68,7 @@ } } if (opened){ - if (this.parentObj.is=='panelMenu') - this.parentObj.lastExpanded = this; + this.parentObj.lastExpanded = this; this.expand(); } else { this.expanded = false; @@ -157,6 +164,7 @@ form.submit(); } }, + itemClicked: function(e){ if(this.action){ if (this.action=='panelMenuNodeAction'){ @@ -170,7 +178,7 @@ this.trigger(e); } } else { - if (this.parentObj.is=='panelMenu'&&this.parentObj.SingleOpen){ + if (this.parentObj.expandSingle){ if (this.parentObj.lastExpanded!=null){ this.parentObj.lastExpanded.collapse(); } @@ -206,7 +214,7 @@ this.trigger(e); } } else { - if (this.parentObj.is=='panelMenu'&&this.parentObj.SingleOpen){ + if (this.parentObj.expandSingle){ if (this.parentObj.lastExpanded!=null){ this.parentObj.lastExpanded.collapse(); }

17 years, 7 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits May 2007