JBoss Rich Faces SVN: r59 - in trunk/richfaces-samples: richfaces-demo and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ishabalov
Date: 2007-03-13 16:38:30 -0400 (Tue, 13 Mar 2007)
New Revision: 59
Modified:
trunk/richfaces-samples/pom.xml
trunk/richfaces-samples/richfaces-demo/pom.xml
Log:
Richfaces demo included to the build list
Modified: trunk/richfaces-samples/pom.xml
===================================================================
--- trunk/richfaces-samples/pom.xml 2007-03-13 20:33:25 UTC (rev 58)
+++ trunk/richfaces-samples/pom.xml 2007-03-13 20:38:30 UTC (rev 59)
@@ -248,5 +248,6 @@
<module>skins</module>
<module>modalpanel-sample</module>
<module>datascroller-sample</module>
+ <module>richfaces-demo</module>
</modules>
</project>
\ No newline at end of file
Modified: trunk/richfaces-samples/richfaces-demo/pom.xml
===================================================================
--- trunk/richfaces-samples/richfaces-demo/pom.xml 2007-03-13 20:33:25 UTC (rev 58)
+++ trunk/richfaces-samples/richfaces-demo/pom.xml 2007-03-13 20:38:30 UTC (rev 59)
@@ -3,7 +3,7 @@
<parent>
<artifactId>richfaces-samples</artifactId>
<groupId>org.richfaces</groupId>
- <version>3.0.0</version>
+ <version>3.0.1-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
19 years, 1 month
JBoss Rich Faces SVN: r58 - in trunk/richfaces: modal-panel/src/main/templates/org/richfaces and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ishabalov
Date: 2007-03-13 16:33:25 -0400 (Tue, 13 Mar 2007)
New Revision: 58
Modified:
trunk/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java
trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java
trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java
trunk/richfaces/panelbar/src/main/templates/panelBar.jspx
trunk/richfaces/panelbar/src/main/templates/panelBarItem.jspx
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
Log:
Fixing problems with rendering children.
Modified: trunk/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java
===================================================================
--- trunk/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-03-13 18:35:27 UTC (rev 57)
+++ trunk/richfaces/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-03-13 20:33:25 UTC (rev 58)
@@ -59,4 +59,8 @@
public abstract int getZindex();
public abstract void setZindex(int zindex);
+
+ public boolean getRendersChildren() {
+ return true;
+ }
}
Modified: trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-13 18:35:27 UTC (rev 57)
+++ trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-13 20:33:25 UTC (rev 58)
@@ -97,7 +97,9 @@
</jsp:scriptlet>
<tr>
<td class="dr-mpnl-pnl-b rich-mpnl-pnl-b" valign="top">
- <vcp:body />
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body>
</td>
</tr>
</table>
Modified: trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java
===================================================================
--- trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java 2007-03-13 18:35:27 UTC (rev 57)
+++ trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBar.java 2007-03-13 20:33:25 UTC (rev 58)
@@ -42,4 +42,8 @@
public abstract void setWidth(String width);
+ public boolean getRendersChildren() {
+ return true;
+ }
+
}
Modified: trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java
===================================================================
--- trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java 2007-03-13 18:35:27 UTC (rev 57)
+++ trunk/richfaces/panelbar/src/main/java/org/richfaces/component/UIPanelBarItem.java 2007-03-13 20:33:25 UTC (rev 58)
@@ -36,5 +36,9 @@
//XXX by nick - andrew - panelBarItem is an immediate panelBar child, no need to traverse up a lot
return (UIPanelBar) getParent();
}
+
+ public boolean getRendersChildren() {
+ return true;
+ }
}
Modified: trunk/richfaces/panelbar/src/main/templates/panelBar.jspx
===================================================================
--- trunk/richfaces/panelbar/src/main/templates/panelBar.jspx 2007-03-13 18:35:27 UTC (rev 57)
+++ trunk/richfaces/panelbar/src/main/templates/panelBar.jspx 2007-03-13 20:33:25 UTC (rev 58)
@@ -14,7 +14,9 @@
<f:clientid var="clientId" />
<div id="#{clientId}" class="dr-pnlbar rich-panelbar dr-pnlbar-b #{component.attributes['styleClass']}" style="padding: 0px; #{this:height(context, component)} #{this:width(context, component)} #{component.attributes['style']}">
- <vcp:body/>
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body>
<f:clientid var="clientId" />
<input type="hidden" name="#{clientId}" id="#{clientId}_panelBarInput"
value="#{this:expanded(context, component)}"/>
Modified: trunk/richfaces/panelbar/src/main/templates/panelBarItem.jspx
===================================================================
--- trunk/richfaces/panelbar/src/main/templates/panelBarItem.jspx 2007-03-13 18:35:27 UTC (rev 57)
+++ trunk/richfaces/panelbar/src/main/templates/panelBarItem.jspx 2007-03-13 20:33:25 UTC (rev 58)
@@ -23,7 +23,9 @@
<div style="display: none; width: 100%;">
<table cellpadding="0" width="100%" style="height: 100%;"><tbody><tr><td class="dr-pnlbar-c rich-panelbar-content #{component.panel.attributes['contentClass']} #{component.attributes['contentClass']}"
style="#{component.panel.attributes['contentStyle']};#{component.attributes['contentStyle']}">
- <vcp:body/>
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body>
</td></tr></tbody></table>
</div>
</div>
Modified: trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java
===================================================================
--- trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2007-03-13 18:35:27 UTC (rev 57)
+++ trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/component/UISimpleTogglePanel.java 2007-03-13 20:33:25 UTC (rev 58)
@@ -62,6 +62,9 @@
public abstract boolean isOpened();
+ public boolean getRendersChildren() {
+ return true;
+ }
public void broadcast(FacesEvent facesEvent) throws AbortProcessingException {
FacesContext facesContext = FacesContext.getCurrentInstance();
Modified: trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx
===================================================================
--- trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-03-13 18:35:27 UTC (rev 57)
+++ trunk/richfaces/simpleTogglePanel/src/main/templates/simpleTogglePanel.jspx 2007-03-13 20:33:25 UTC (rev 58)
@@ -108,6 +108,7 @@
<tr>
<td class="dr-stglpnl-b rich-stglpanel-body #{component.attributes['bodyClass']}">
<vcp:body>
+ <f:call name="renderChildren" />
</vcp:body>
</td>
</tr>
19 years, 1 month
JBoss Rich Faces SVN: r57 - in trunk/richfaces/modal-panel/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-03-13 14:35:27 -0400 (Tue, 13 Mar 2007)
New Revision: 57
Modified:
trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
Fix wrong position of first appearing of modal panel in Opera.
Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-03-13 18:22:23 UTC (rev 56)
+++ trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-03-13 18:35:27 UTC (rev 57)
@@ -227,7 +227,11 @@
_left = parseInt(options.left, 10);
} else {
var cw = getSizeElement().clientWidth;
- _left = (cw - Richfaces.getComputedStyleSize(this.cdiv, "width")) / 2;
+ if (RichFaces.navigatorType() == "OPERA")
+ _left = (cw - this.cdiv.style.width.replace("px", "")) / 2;
+ else
+ _left = (cw - Richfaces.getComputedStyleSize(this.cdiv, "width")) / 2;
+
}
this.setLeft(_left);
Modified: trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-13 18:22:23 UTC (rev 56)
+++ trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-13 18:35:27 UTC (rev 57)
@@ -19,7 +19,8 @@
new org.ajax4jsf.framework.resource.PrototypeScript(),
/org/richfaces/renderkit/html/scripts/utils.js,
/org/richfaces/renderkit/html/scripts/modalPanel.js,
- /org/richfaces/renderkit/html/scripts/modalPanelBorders.js
+ /org/richfaces/renderkit/html/scripts/modalPanelBorders.js,
+ /org/richfaces/renderkit/html/scripts/browser_info.js
</h:scripts>
<f:clientid var="clientId"/>
19 years, 1 month
JBoss Rich Faces SVN: r56 - trunk/richfaces/modal-panel/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-03-13 14:22:23 -0400 (Tue, 13 Mar 2007)
New Revision: 56
Modified:
trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
Wrapper CSS class "rich-modalpanel" was added to the top <div> element.
Modified: trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-13 18:20:24 UTC (rev 55)
+++ trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-13 18:22:23 UTC (rev 56)
@@ -27,7 +27,8 @@
<div id="#{clientId}"
name="#{clientId}"
x:passThruWithExclusions="value,name,type,id"
- style="position: relative; display: none;"
+ style="position: relative; display: none;"
+ class="rich-modalpanel"
>
<f:call name="checkOptions" />
19 years, 1 month
JBoss Rich Faces SVN: r55 - trunk/richfaces/modal-panel/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-03-13 14:20:24 -0400 (Tue, 13 Mar 2007)
New Revision: 55
Modified:
trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
Log:
Fix border visibility when modal panel size is less then its content need.
Modified: trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-13 18:17:11 UTC (rev 54)
+++ trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-03-13 18:20:24 UTC (rev 55)
@@ -66,8 +66,9 @@
]]>
</jsp:scriptlet>
- <div style="position: absolute; width: 100%; height: 100%; overflow: hidden; z-index: #{component.zindex - 1};">
- <table class="dr-mpnl-pnl" style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0">
+ <div style="position: absolute; width: 100%; height: 100%; overflow: hidden; z-index: #{component.zindex - 1};"
+ class="dr-mpnl-pnl" >
+ <table style="height: 100%; width: 100%;" border="0" cellpadding="0" cellspacing="0">
<jsp:scriptlet>
<![CDATA[if(component.getFacet("header")!=null && component.getFacet("header").isRendered()) {]]>
</jsp:scriptlet>
19 years, 1 month
JBoss Rich Faces SVN: r54 - in trunk: richfaces/assembly and 23 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-03-13 14:17:11 -0400 (Tue, 13 Mar 2007)
New Revision: 54
Added:
trunk/richfaces-samples/tabPanelDemo/src/main/webapp/pages/rendering.jsp
Modified:
trunk/richfaces-samples/tabPanelDemo/pom.xml
trunk/richfaces/assembly/pom.xml
trunk/richfaces/dataFilterSlider/pom.xml
trunk/richfaces/dataTable/pom.xml
trunk/richfaces/datascroller/pom.xml
trunk/richfaces/drag-drop/pom.xml
trunk/richfaces/gmap/pom.xml
trunk/richfaces/inputnumber-slider/pom.xml
trunk/richfaces/inputnumber-spinner/pom.xml
trunk/richfaces/modal-panel/pom.xml
trunk/richfaces/paint2D/pom.xml
trunk/richfaces/panel/pom.xml
trunk/richfaces/panelbar/pom.xml
trunk/richfaces/pom.xml
trunk/richfaces/separator/pom.xml
trunk/richfaces/simpleTogglePanel/pom.xml
trunk/richfaces/spacer/pom.xml
trunk/richfaces/suggestionbox/pom.xml
trunk/richfaces/tabPanel/pom.xml
trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
trunk/richfaces/tabPanel/src/main/templates/tabPanel.jspx
trunk/richfaces/togglePanel/pom.xml
trunk/richfaces/toolBar/pom.xml
trunk/richfaces/tree/pom.xml
Log:
RF-5 issue fixing.
Fix CDK version in a components pom's
Modified: trunk/richfaces/assembly/pom.xml
===================================================================
--- trunk/richfaces/assembly/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/assembly/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<configuration>
<library>
<prefix>org.richfaces</prefix>
Modified: trunk/richfaces/dataFilterSlider/pom.xml
===================================================================
--- trunk/richfaces/dataFilterSlider/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/dataFilterSlider/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -14,7 +14,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/dataTable/pom.xml
===================================================================
--- trunk/richfaces/dataTable/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/dataTable/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/datascroller/pom.xml
===================================================================
--- trunk/richfaces/datascroller/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/datascroller/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/drag-drop/pom.xml
===================================================================
--- trunk/richfaces/drag-drop/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/drag-drop/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/gmap/pom.xml
===================================================================
--- trunk/richfaces/gmap/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/gmap/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/inputnumber-slider/pom.xml
===================================================================
--- trunk/richfaces/inputnumber-slider/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/inputnumber-slider/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/inputnumber-spinner/pom.xml
===================================================================
--- trunk/richfaces/inputnumber-spinner/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/inputnumber-spinner/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/modal-panel/pom.xml
===================================================================
--- trunk/richfaces/modal-panel/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/modal-panel/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/paint2D/pom.xml
===================================================================
--- trunk/richfaces/paint2D/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/paint2D/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/panel/pom.xml
===================================================================
--- trunk/richfaces/panel/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/panel/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/panelbar/pom.xml
===================================================================
--- trunk/richfaces/panelbar/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/panelbar/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/pom.xml
===================================================================
--- trunk/richfaces/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -1,19 +1,23 @@
-<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">
+<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-parent</artifactId>
<packaging>pom</packaging>
<name>RichFaces Components</name>
- <version>3.0.1-SNAPSHOT</version>
- <url>http://labs.jboss.com/jbossrichfaces</url>
+ <version>3.0.1-SNAPSHOT</version>
+ <url>http://richfaces.ajax4jsf.org</url>
+ <!--
+ <url>http://labs.jboss.com/jbossrichfaces</url>
+ -->
<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
+ GNU LESSER GENERAL PUBLIC LICENSE Version 2.1
</comments>
</license>
</licenses>
@@ -72,17 +76,19 @@
</developer>
</developers>
<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>
+ <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>
</distributionManagement>
<scm>
<connection>
@@ -252,7 +258,7 @@
<module>tree</module>
<module>suggestionbox</module>
<module>dataTable</module>
- <module>modal-panel</module>
- <module>datascroller</module>
+ <module>modal-panel</module>
+ <module>datascroller</module>
</modules>
</project>
\ No newline at end of file
Modified: trunk/richfaces/separator/pom.xml
===================================================================
--- trunk/richfaces/separator/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/separator/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/simpleTogglePanel/pom.xml
===================================================================
--- trunk/richfaces/simpleTogglePanel/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/simpleTogglePanel/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/spacer/pom.xml
===================================================================
--- trunk/richfaces/spacer/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/spacer/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/suggestionbox/pom.xml
===================================================================
--- trunk/richfaces/suggestionbox/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/suggestionbox/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/tabPanel/pom.xml
===================================================================
--- trunk/richfaces/tabPanel/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/tabPanel/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java
===================================================================
--- trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/tabPanel/src/main/java/org/richfaces/renderkit/TabPanelRendererBase.java 2007-03-13 18:17:11 UTC (rev 54)
@@ -301,4 +301,5 @@
return collector;
}
+
}
Modified: trunk/richfaces/tabPanel/src/main/templates/tabPanel.jspx
===================================================================
--- trunk/richfaces/tabPanel/src/main/templates/tabPanel.jspx 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/tabPanel/src/main/templates/tabPanel.jspx 2007-03-13 18:17:11 UTC (rev 54)
@@ -1,19 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<f:root
- xmlns:f="http://ajax4jsf.org/cdk/template"
- xmlns:c=" http://java.sun.com/jsf/core"
- xmlns:ui=" http://ajax4jsf.org/cdk/ui"
- xmlns:u=" http://ajax4jsf.org/cdk/u"
- xmlns:x=" http://ajax4jsf.org/cdk/x"
- xmlns:h="http://jsf.exadel.com/header"
- xmlns:vcp="http://ajax4jsf.org/cdk/vcp"
-
- baseclass="org.richfaces.renderkit.TabPanelRendererBase"
- class="org.richfaces.renderkit.html.TabPanelRenderer"
- component="org.richfaces.component.UITabPanel"
- >
-
- <h:styles>css/tabPanel.xcss</h:styles>
+<?xml version="1.0" encoding="UTF-8"?>
+<f:root xmlns:f="http://ajax4jsf.org/cdk/template"
+ xmlns:c=" http://java.sun.com/jsf/core"
+ xmlns:ui=" http://ajax4jsf.org/cdk/ui"
+ xmlns:u=" http://ajax4jsf.org/cdk/u"
+ xmlns:x=" http://ajax4jsf.org/cdk/x"
+ xmlns:h="http://jsf.exadel.com/header"
+ xmlns:vcp="http://ajax4jsf.org/cdk/vcp"
+ baseclass="org.richfaces.renderkit.TabPanelRendererBase"
+ class="org.richfaces.renderkit.html.TabPanelRenderer"
+ component="org.richfaces.component.UITabPanel">
+
+ <h:styles>css/tabPanel.xcss</h:styles>
<h:scripts>
new org.ajax4jsf.framework.resource.PrototypeScript(),
new org.ajax4jsf.framework.ajax.AjaxScript(),
@@ -21,44 +18,47 @@
/org/richfaces/renderkit/html/scripts/browser_info.js,
/org/ajax4jsf/renderkit/html/scripts/form.js,
scripts/tabPanel.js
- </h:scripts>
-
- <f:clientid var="clientId"/>
-
- <f:resource name="images/spacer.gif" var="spacer" />
-
- <table border="0" cellpadding="0" cellspacing="0"
- id="#{clientId}" class="rich-tabpanel #{component.attributes['styleClass']}" style="#{this:encodeStyles(context, component)}">
- <f:call name="utils.encodePassThruWithExclusions">
- <f:parameter value="width,height" />
- </f:call>
-
- <tbody>
- <tr>
- <td align="#{component.headerAlignment}">
- <f:call name="utils.encodeBeginFormIfNessesary" />
-
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td><img src="#{spacer}" width="2" height="1" alt="" border="0" /></td>
- <f:call name="encodeTabs" />
- <td><img src="#{spacer}" width="1" height="1" alt="" border="0" /></td>
- </tr>
- </table>
- <c:if test="#{clientSide}">
- <div style="display: none;">
- <input type="hidden" id="#{clientId}_input" name="#{clientId}" value="#{this:getValueAsString(context, component)}" />
- <f:call name="encodeTabsScript" />
- </div>
- </c:if>
- <f:call name="utils.encodeEndFormIfNessesary" />
- </td>
- </tr>
- <tr>
- <vcp:body />
- </tr>
- </tbody>
- </table>
-</f:root>
-
-
+ </h:scripts>
+
+ <f:clientid var="clientId" />
+
+ <f:resource name="images/spacer.gif" var="spacer" />
+
+ <table border="0" cellpadding="0" cellspacing="0" id="#{clientId}"
+ class="rich-tabpanel #{component.attributes['styleClass']}"
+ style="#{this:encodeStyles(context, component)}">
+ <f:call name="utils.encodePassThruWithExclusions">
+ <f:parameter value="width,height" />
+ </f:call>
+
+ <tbody>
+ <tr>
+ <td align="#{component.headerAlignment}"><f:call
+ name="utils.encodeBeginFormIfNessesary" />
+
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td><img src="#{spacer}" width="2" height="1" alt=""
+ border="0" /></td>
+ <f:call name="encodeTabs" />
+ <td><img src="#{spacer}" width="1" height="1" alt=""
+ border="0" /></td>
+ </tr>
+ </table>
+ <c:if test="#{clientSide}">
+ <div style="display: none;"><input type="hidden"
+ id="#{clientId}_input" name="#{clientId}"
+ value="#{this:getValueAsString(context, component)}" /> <f:call
+ name="encodeTabsScript" /></div>
+ </c:if> <f:call name="utils.encodeEndFormIfNessesary" /></td>
+ </tr>
+ <tr>
+ <vcp:body>
+ <f:call name="renderChildren" />
+ </vcp:body>
+ </tr>
+ </tbody>
+ </table>
+</f:root>
+
+
Modified: trunk/richfaces/togglePanel/pom.xml
===================================================================
--- trunk/richfaces/togglePanel/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/togglePanel/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/toolBar/pom.xml
===================================================================
--- trunk/richfaces/toolBar/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/toolBar/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -12,7 +12,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces/tree/pom.xml
===================================================================
--- trunk/richfaces/tree/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces/tree/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -13,7 +13,7 @@
<plugin>
<groupId>org.ajax4jsf.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<executions>
<execution>
<phase>generate-sources</phase>
Modified: trunk/richfaces-samples/tabPanelDemo/pom.xml
===================================================================
--- trunk/richfaces-samples/tabPanelDemo/pom.xml 2007-03-13 17:55:42 UTC (rev 53)
+++ trunk/richfaces-samples/tabPanelDemo/pom.xml 2007-03-13 18:17:11 UTC (rev 54)
@@ -24,6 +24,11 @@
<artifactId>tabPanel</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>panel</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.richfaces</groupId>
<artifactId>skins</artifactId>
Added: trunk/richfaces-samples/tabPanelDemo/src/main/webapp/pages/rendering.jsp
===================================================================
--- trunk/richfaces-samples/tabPanelDemo/src/main/webapp/pages/rendering.jsp (rev 0)
+++ trunk/richfaces-samples/tabPanelDemo/src/main/webapp/pages/rendering.jsp 2007-03-13 18:17:11 UTC (rev 54)
@@ -0,0 +1,154 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="https://ajax4jsf.dev.java.net/ajax" prefix="a4j" %>
+<%@ taglib uri="http://richfaces.ajax4jsf.org/tabPanel" prefix="tabs" %>
+<%@ taglib uri="http://richfaces.ajax4jsf.org/panel" prefix="panel" %>
+<html>
+ <head>
+ <title></title>
+ <style type="text/css">
+ .italic {
+ font-style: italic;
+ }
+
+ .tabClass {
+ font-size: 16px;
+ font-family: fantasy;
+ color:red;
+ }
+
+ .rich-tab-active {
+ font-size: 16px;
+ font-family: fantasy;
+ color:purple;
+ }
+
+ .rich-tab-inactive {
+ font-size: 14px;
+ font-family: fantasy;
+ color:green;
+ }
+
+ .rich-tab-disabled {
+ font-size: 12px;
+ font-family: fantasy;
+ color:gold;
+ }
+
+ .rich-tabhdr-cell-inactive, .rich-tabhdr-cell-disabled {
+ padding-bottom: 2px;
+ }
+
+ .rich-tabpanel-content-position {
+ top: -2px;
+ }
+
+ .rich-tabpanel-content {
+ border-width: 2px;
+ border-color:red;
+ }
+ </style>
+ </head>
+ <body bgcolor="white">
+ <f:view>
+
+ <h:form>
+ <h:selectOneRadio binding="#{skinBean.component}" />
+ <h:commandLink action="#{skinBean.change}" value="set skin" />
+ </h:form>
+
+ <a4j:outputPanel ajaxRendered="true">
+ <h:messages />
+ </a4j:outputPanel>
+
+ <h:form>
+ <h:selectOneMenu value="#{bean.tabPanel.value}">
+ <f:selectItem itemLabel="canon" itemValue="canon" />
+ <f:selectItem itemLabel="olympus" itemValue="olympus" />
+ <f:selectItem itemLabel="nikon" itemValue="nikon" />
+ </h:selectOneMenu>
+
+ <h:commandLink value="apply" />
+ </h:form>
+
+ <tabs:tabPanel headerSpacing="5px" immediate="false" tabClass="tabClass" activeTabClass="italic" width="100%" switchType="client" binding="#{bean.tabPanel}" value="#{bean.currentTab}" id="tab_panel">
+ <tabs:tab disabled="#{bean.disabledTabName == 'canon'}" name="canon" label="Canon" switchType="server">
+ <panel:panel>
+ <f:facet name="header">
+ <h:outputText value="Canon EOS Digital Rebel XT" />
+ </f:facet>
+ <h:graphicImage value="/pages/Canon_EOS_Digital_Rebel_XT.jpg" alt=""/>
+ <h:form>
+ <f:verbatim>
+ 8.2 Megapixels - SLR / Large Digital Camera - 1.8 in LCD Screen -
+ Storage: Compact Flash, Compact Flash Type II - Built In Flash
+ <br />
+ Achieve the same professional results as film cameras in a flexible,
+ digital format with the Canon EOS Digital Rebel XT. The EOS digital
+ Rebel XT flawlessly combines ease of use with unequalled SLR performance.
+ This compact digital camera features not only lightweight design and
+ compatibility with over 50 EF lenses, but also an 8.0 megapixel CMOS
+ sensor and DIGIC II image processor. Boasting a 7-point wide area AF
+ system and one battery pack, this compact camera comes with digital storage
+ media (CF card Type I and II). Take advantage of the 10 second self-timer
+ delay offered by this Canon camera. Correct the color of any image with these
+ white balance settings: auto, preset, daylight, shad, cloudy, twilight, sunset,
+ Tungsten light, White fluorescent light, flash, and custom. With USB 2.0
+ connector and PictBridge printer compatibility, this digital camera also
+ features a 1,8'' TFT color monitor. Enjoy the ease of use, affordability,
+ and powerful performance of the Canon EOS Digital Rebel XT.
+ </f:verbatim>
+ </h:form>
+ </panel:panel>
+ </tabs:tab>
+ <tabs:tab disabled="#{bean.disabledTabName == 'nikon'}" name="nikon" label="Nikon" labelWidth="200px">
+ <h:form>
+ <h:graphicImage value="/pages/Nikon_D70s.jpg" alt=""/>
+ <h:outputText value="Nikon D70s" />
+ <h:inputText value="#{bean.value2}" required="true" />
+ <f:verbatim>
+ 6.1 Megapixels - SLR / Large Digital Camera - 2 in LCD Screen -
+ Storage: Compact Flash, Microdrive Compatible, Compact Flash Type II - Built In Flash
+ <br />
+ Revolutionize every digital photography experience with the Nikon D70s digital
+ camera. Designed for amateurs and professionals alike, this Nikon digital camera
+ features a high resolution of 6.1 megapixels and a large 2.0'' LCD screen. Offering
+ i-TTL speedlight, 5-point autofocus, and lens compatibility with AF and AF-S Nikkor
+ lenses, this digital SLR camera comes with a rechargeable lithium-ion battery for
+ continual performance. With seven shooting modes, including auto, portrait, night
+ portrait, landscape, night landscape, sports, and close-up, this impressive Nikon
+ digital camera delivers professional quality results with every use.
+ </f:verbatim>
+ </h:form>
+ </tabs:tab>
+ <tabs:tab disabled="#{bean.disabledTabName == 'olympus'}" name="olympus" label="Olympus Olympus" labelWidth="60px">
+ <h:panelGrid columns="2" width="100%">
+ <h:graphicImage value="/pages/Olympus_EVOLT_E-500.jpg" alt=""/>
+ <h:panelGroup>
+ <h:outputText value="Olympus EVOLT E-500" />
+ <f:verbatim>
+ 8 Megapixels - SLR / Large Digital Camera - 2.5 in LCD Screen -
+ Storage: Compact Flash, xD-Picture Card, Compact Flash Type II - Built In Flash
+ <br />
+ Perfect for producing elaborate photography from the professional or the beginner,
+ this Olympus digital camera packs tons of features into its compact body.
+ Delivering SLR performance at an affordable price, this digital camera offers a
+ Dust Reduction System to clean photos of unwanted spots. With 8 megapixel resolution
+ and a TruePic TURBO Image Processor, this Olympus EVOLT definitely stands out from
+ competing digital cameras. Compatible with different Olympus Zuiko Digital Specific
+ Lenses, this digital camera boasts a 2.5'' HyperCrystal LCD screen. For a digital
+ photography experience unmatched by any other camera, bring home this Olympus
+ EVOLT E-500.
+ </f:verbatim>
+ </h:panelGroup>
+ </h:panelGrid>
+ </tabs:tab>
+ <tabs:tab disabled="true" name="disabled" label="Disabled">
+ </tabs:tab>
+ </tabs:tabPanel>
+ <br /><br />
+ </f:view>
+ </body>
+</html>
19 years, 1 month
JBoss Rich Faces SVN: r53 - trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-03-13 13:55:42 -0400 (Tue, 13 Mar 2007)
New Revision: 53
Modified:
trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
Log:
Fix JS errors in show/hide functions when rendered=false or invalid ID is provided.
Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js
===================================================================
--- trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-03-13 17:52:14 UTC (rev 52)
+++ trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/scripts/modalPanel.js 2007-03-13 17:55:42 UTC (rev 53)
@@ -471,9 +471,13 @@
}
Richfaces.showModalPanel = function (id, opts) {
- $(id).modalPanel.show(opts);
+ var panel = $(id);
+ if (panel && panel.modalPanel)
+ panel.modalPanel.show(opts);
}
Richfaces.hideModalPanel = function (id) {
- $(id).modalPanel.hide();
+ var panel = $(id);
+ if (panel && panel.modalPanel)
+ panel.modalPanel.hide();
}
19 years, 1 month
JBoss Rich Faces SVN: r51 - trunk/richfaces/drag-drop/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: d.bulahov
Date: 2007-03-13 06:29:46 -0400 (Tue, 13 Mar 2007)
New Revision: 51
Modified:
trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx
Log:
RFA-303 fixed
Modified: trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx
===================================================================
--- trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-03-13 10:05:46 UTC (rev 50)
+++ trunk/richfaces/drag-drop/src/main/templates/org/richfaces/htmlDragIndicator.jspx 2007-03-13 10:29:46 UTC (rev 51)
@@ -22,12 +22,15 @@
<div id="#{clientId}" class="drgind_fly drgind_default drag_indicator #{component.attributes['styleClass']}" style="display: none; #{component.attributes['style']}">
<script type="text/javascript">
+ //<![CDATA[
var elt = $("#{clientId}");
elt.markers = {};
elt.indicatorTemplates = {};
-
+ //]]>
<f:call name="encodeChildScripts" />
+ //<![CDATA[
createDragIndicator(elt);
+ //]]>
</script>
<vcp:body />
</div>
19 years, 1 month
JBoss Rich Faces SVN: r50 - trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd.
by richfaces-svn-commits＠lists.jboss.org
Author: F.antonov
Date: 2007-03-13 06:05:46 -0400 (Tue, 13 Mar 2007)
New Revision: 50
Modified:
trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js
Log:
Fix for bug RFA-195.
Modified: trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js
===================================================================
--- trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-03-12 19:10:22 UTC (rev 49)
+++ trunk/richfaces/common/src/main/resources/org/richfaces/renderkit/html/scripts/dnd/dnd-draggable.js 2007-03-13 10:05:46 UTC (rev 50)
@@ -34,13 +34,26 @@
getOrCreateDefaultIndicator: function() {
var dragDiv = $("_rfDefaultDragIndicator");
- if (!dragDiv) {
+ if (!dragDiv) {
+ dragDiv = document.createElement("div");
+ dragDiv.id = "_rfDefaultDragIndicatorLeft";
+ document.body.appendChild(dragDiv);
+ dragDiv = document.createElement("div");
+ dragDiv.id = "_rfDefaultDragIndicatorRight";
+ document.body.appendChild(dragDiv);
+ dragDiv = document.createElement("div");
+ dragDiv.id = "_rfDefaultDragIndicatorBottom";
+ Element.setStyle(dragDiv, {"font-size" : "0px"});
+ document.body.appendChild(dragDiv);
+
dragDiv = document.createElement("div");
dragDiv.id = "_rfDefaultDragIndicator";
- Object.extend(dragDiv, DefaultDragIndicator);
+ Element.setStyle(dragDiv, {"font-size" : "0px"});
+ Object.extend(dragDiv, DefaultDragIndicator);
document.body.appendChild(dragDiv);
}
- Element.setStyle(dragDiv, {"border" : "1px dashed black"});
+ DefaultDragIndicator.changeIndicatorColor(dragDiv, "black");
+
return dragDiv;
},
@@ -64,20 +77,24 @@
var type = this.getContentType();
var indicator = this.getIndicator();
var drag = new DnD.Drag(this, indicator, type);
+
+ if (indicator.id.indexOf("_rfDefaultDragIndicator") != -1) {
+ var target = drag.source.getElement();
+ var offSets = Position.cumulativeOffset(target);
+ indicator.indicatorWidth = Element.getWidth(target);
+ indicator.indicatorHeight = Element.getHeight(target);
+ indicator.position(offSets[0], offSets[1]);
+ indicator.removalX = Event.pointerX(event) - offSets[0];
+ indicator.removalY = Event.pointerY(event) - offSets[1];
+ }
+
DnD.startDrag(drag);
DnD.updateDrag(event);
this.ondragstart(event, drag);
- if (indicator) {
+ if (indicator) {
indicator.show();
- }
+ }
-/* if (indicator.id.indexOf("_rfDefaultDragIndicator") != -1) {
- Position.clone(Event.element(event), indicator);
- var offSets = Position.cumulativeOffset(Event.element(event));
- indicator.removalX = Event.pointerX(event) - offSets[0];
- indicator.removalY = Event.pointerY(event) - offSets[1];
- } */
-
if( this.options && this.options.ondragstart) {
this.options.ondragstart();
}
@@ -111,7 +128,7 @@
* @param {Object} drag
*/
ondragstart: function(event, drag) {
-
+
},
ondragend: function (event, drag) {
@@ -128,35 +145,102 @@
if (window.drag && window.drag.source) {
var target = window.drag.source.getElement();
- Element.setStyle(this, {"width": Element.getWidth(target) + "px", "height": Element.getHeight(target) + "px"});
-
+ Element.setStyle(this, {"width": Element.getWidth(target) + "px", "height": "1px"});
Element.show(this);
this.style.position = 'absolute';
+
+ var elt = $("_rfDefaultDragIndicatorLeft");
+ if (elt) {
+ Element.setStyle(elt, {"width": "1px", "height": Element.getHeight(target) + "px"});
+ Element.show(elt);
+ elt.style.position = 'absolute';
+ }
+ elt = $("_rfDefaultDragIndicatorRight");
+ if (elt) {
+ Element.setStyle(elt, {"width": "1px", "height": Element.getHeight(target) + "px"});
+ Element.show(elt);
+ elt.style.position = 'absolute';
+ }
+ elt = $("_rfDefaultDragIndicatorBottom");
+ if (elt) {
+ Element.setStyle(elt, {"width": Element.getWidth(target) + "px", "height": "1px"});
+ Element.show(elt);
+ elt.style.position = 'absolute';
+ }
}
},
hide: function() {
Element.hide(this);
this.style.position = '';
+
+ var elt = $("_rfDefaultDragIndicatorLeft");
+ if (elt) {
+ Element.hide(elt);
+ elt.style.position = '';
+ }
+ elt = $("_rfDefaultDragIndicatorRight");
+ if (elt) {
+ Element.hide(elt);
+ elt.style.position = '';
+ }
+ elt = $("_rfDefaultDragIndicatorBottom");
+ if (elt) {
+ Element.hide(elt);
+ elt.style.position = '';
+ }
},
position: function(x, y) {
-/* if (this.id.indexOf("_rfDefaultDragIndicator") != -1 && this.removalX && this.removalY) {
+ if (this.removalX && this.removalY) {
x -= (this.removalX + 5);
y -= (this.removalY + 14);
- } */
+ }
Element.setStyle(this, {"left": x + "px", "top": y + "px"});
+
+ var elt = $("_rfDefaultDragIndicatorLeft");
+ if (elt) {
+ Element.setStyle(elt, {"left": x + "px", "top": y + "px"});
+ }
+ x += this.indicatorWidth;
+ elt = $("_rfDefaultDragIndicatorRight");
+ if (elt) {
+ Element.setStyle(elt, {"left": x + "px", "top": y + "px"});
+ }
+ x -= this.indicatorWidth;
+ y += this.indicatorHeight;
+ elt = $("_rfDefaultDragIndicatorBottom");
+ if (elt) {
+ Element.setStyle(elt, {"left": x + "px", "top": y + "px"});
+ }
},
accept: function() {
- Element.setStyle(this, {"border" : "1px dashed green"});
+ this.changeIndicatorColor(this, "green");
},
reject: function() {
- Element.setStyle(this, {"border" : "1px dashed red"});
+ this.changeIndicatorColor(this, "red");
},
leave: function() {
- Element.setStyle(this, {"border" : "1px dashed black"});
+ this.changeIndicatorColor(this, "black");
+ },
+
+ changeIndicatorColor: function(indicator, color) {
+ Element.setStyle(indicator, {"border-top" : "1px dashed "+color});
+
+ var elt = $("_rfDefaultDragIndicatorLeft");
+ if (elt) {
+ Element.setStyle(elt, {"border-left" : "1px dashed "+color});
+ }
+ elt = $("_rfDefaultDragIndicatorRight");
+ if (elt) {
+ Element.setStyle(elt, {"border-right" : "1px dashed "+color});
+ }
+ elt = $("_rfDefaultDragIndicatorBottom");
+ if (elt) {
+ Element.setStyle(elt, {"border-bottom" : "1px dashed "+color});
+ }
}
};
19 years, 1 month