You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/02/01 10:41:14 UTC
svn commit: r1239023 - in /myfaces/tobago/branches/tobago-tree-table:
tobago-assembly/ tobago-assembly/src/main/resources/
tobago-example/tobago-example-addressbook/
tobago-example/tobago-example-addressbook/src/main/resources/
tobago-example/tobago-ex...
Author: lofwyr
Date: Wed Feb 1 09:41:12 2012
New Revision: 1239023
URL: http://svn.apache.org/viewvc?rev=1239023&view=rev
Log:
merged against the trunk
Modified:
myfaces/tobago/branches/tobago-tree-table/tobago-assembly/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-assembly/src/main/resources/NOTICE.txt
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/resources/META-INF/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/resources/log4j.xml (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/standard/standard/property/error/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/test/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/resources/META-INF/wizardFinish.xml (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/resources/META-INF/wizardNext.xml (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/resources/META-INF/wizardPrevious.xml (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/resources/META-INF/wizardTrain.xml (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-fileupload/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-sandbox/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-security/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/src/main/java-jsf-1.1/javax/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeMarkedListener.java (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-theme/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-charlotteville/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-richmond/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/jquery-ui/ (props changed)
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
myfaces/tobago/branches/tobago-tree-table/tobago-tool/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml
myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-assembly/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-assembly/pom.xml Wed Feb 1 09:41:12 2012
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<dependencies>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-assembly/src/main/resources/NOTICE.txt?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-assembly/src/main/resources/NOTICE.txt (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-assembly/src/main/resources/NOTICE.txt Wed Feb 1 09:41:12 2012
@@ -1,5 +1,5 @@
Apache Tobago
-Copyright 2005-2011 The Apache Software Foundation
+Copyright 2005-2012 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-example-addressbook</artifactId>
<packaging>war</packaging>
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/resources/META-INF/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 1 09:41:12 2012
@@ -1 +1,2 @@
/myfaces/tobago/trunk/example/addressbook/src/main/resources/META-INF:699460,699891-700092,743495-743708,744771-744909,744926
+/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/resources/META-INF:1226794-1239018
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/resources/log4j.xml
('svn:mergeinfo' removed)
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 1 09:41:12 2012
@@ -1 +1,2 @@
/myfaces/tobago/trunk/example/addressbook/src/main/webapp:699460,699891-700092,743495-743708,744771-744909,744926
+/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp:1226794-1239018
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 1 09:41:12 2012
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook:1226794-1239018
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 1 09:41:12 2012
@@ -1 +1,2 @@
/myfaces/tobago/trunk/example/addressbook/src/main/webapp/tobago-resource:699460,699891-700092,743495-743708,744771-744909,744926
+/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource:1226794-1239018
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/
('svn:mergeinfo' removed)
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/standard/standard/property/error/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 1 09:41:12 2012
@@ -1 +1,2 @@
/myfaces/tobago/trunk/example/addressbook/src/main/resources/error:699460,699891-700092,743495-743708,744771-744909,744926
+/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/main/webapp/addressbook-resource/html/standard/standard/property/error:1226794-1239018
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-example-addressbook/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Feb 1 09:41:12 2012
@@ -1 +1,2 @@
/myfaces/tobago/trunk/example/addressbook/src/test:699460,699891-700092,743495-743708,744771-744909,744926
+/myfaces/tobago/trunk/tobago-example/tobago-example-addressbook/src/test:1226794-1239018
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-example/tobago-theme-example/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-example</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-example</artifactId>
<name>Tobago Theme Example</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Tobago Extensions</name>
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/
('svn:mergeinfo' removed)
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-deprecation/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Tobago Deprecation</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-facelets</artifactId>
<packaging>jar</packaging>
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/MetaInfResourcesClasspathResourceResolver.java
('svn:mergeinfo' removed)
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/resources/META-INF/wizardFinish.xml
('svn:mergeinfo' removed)
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/resources/META-INF/wizardNext.xml
('svn:mergeinfo' removed)
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/resources/META-INF/wizardPrevious.xml
('svn:mergeinfo' removed)
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-facelets/src/main/resources/META-INF/wizardTrain.xml
('svn:mergeinfo' removed)
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-fileupload/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-fileupload/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-fileupload/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-fileupload/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Tobago Fileupload</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-sandbox/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-sandbox/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-sandbox</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-security/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-security/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-security/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-security/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Tobago Security</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-extension</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-taglib-extension</artifactId>
<packaging>jar</packaging>
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/
('svn:mergeinfo' removed)
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java Wed Feb 1 09:41:12 2012
@@ -26,17 +26,17 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.HasIdBindingAndRendered;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabel;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasLabelWidth;
+import org.apache.myfaces.tobago.internal.taglib.declaration.HasMarkup;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasOnchange;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasRequiredMessage;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasTabIndex;
-import org.apache.myfaces.tobago.internal.taglib.declaration.HasTip;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValidator;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValidatorMessage;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValue;
import org.apache.myfaces.tobago.internal.taglib.declaration.HasValueChangeListener;
+import org.apache.myfaces.tobago.internal.taglib.declaration.IsDeprecatedInline;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsDisabled;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsFocus;
-import org.apache.myfaces.tobago.internal.taglib.declaration.IsDeprecatedInline;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsRequired;
@@ -64,7 +64,7 @@ import javax.servlet.jsp.tagext.BodyTagS
@ExtensionTag(baseClassName = "org.apache.myfaces.tobago.internal.taglib.TimeTag")
public class TimeExtensionTag extends BodyTagSupport
implements HasValue, HasValueChangeListener, HasValidator, HasIdBindingAndRendered,
- HasConverter, IsReadonly, IsDisabled, HasOnchange, IsRequired, HasTip,
+ HasConverter, IsReadonly, IsDisabled, HasOnchange, HasMarkup, IsRequired,
HasValidatorMessage, HasRequiredMessage, HasConverterMessage,
HasLabel, HasLabelWidth, IsFocus, IsDeprecatedInline, HasTabIndex, HasFieldId {
@@ -82,6 +82,7 @@ public class TimeExtensionTag extends Bo
private String valueChangeListener;
private String inline;
private String onchange;
+ private String markup;
private String labelWidth;
private String tabIndex;
private String validatorMessage;
@@ -112,6 +113,9 @@ public class TimeExtensionTag extends Bo
if (labelWidth != null) {
labelTag.setColumns(labelWidth + ";*");
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.doStartTag();
@@ -156,6 +160,9 @@ public class TimeExtensionTag extends Bo
if (required != null) {
timeTag.setRequired(required);
}
+ if (markup != null) {
+ timeTag.setMarkup(markup);
+ }
if (tabIndex != null) {
timeTag.setTabIndex(tabIndex);
}
@@ -200,6 +207,7 @@ public class TimeExtensionTag extends Bo
value = null;
onchange = null;
valueChangeListener = null;
+ markup = null;
tabIndex = null;
timeTag = null;
labelTag = null;
@@ -209,6 +217,10 @@ public class TimeExtensionTag extends Bo
fieldId = null;
}
+ public void setMarkup(String markup) {
+ this.markup = markup;
+ }
+
public void setValue(String value) {
this.value = value;
}
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/
('svn:mergeinfo' removed)
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/InExtensionTag.java Wed Feb 1 09:41:12 2012
@@ -236,9 +236,9 @@ public class InExtensionTag extends Toba
*/
@TagAttribute
@UIComponentTagAttribute(
- type = {},
- expression = DynamicExpression.METHOD_BINDING_REQUIRED,
- methodSignature = "javax.faces.event.ValueChangeEvent")
+ type = {},
+ expression = DynamicExpression.METHOD_BINDING_REQUIRED,
+ methodSignature = "javax.faces.event.ValueChangeEvent")
public void setValueChangeListener(javax.el.MethodExpression valueChangeListener) {
this.valueChangeListener = valueChangeListener;
}
@@ -271,6 +271,7 @@ public class InExtensionTag extends Toba
public void setBinding(javax.el.ValueExpression binding) {
this.binding = binding;
}
+
/**
* Flag indicating whether or not this component should be rendered
* (during Render Response Phase), or processed on any subsequent form submit.
@@ -326,7 +327,7 @@ public class InExtensionTag extends Toba
@TagAttribute
@UIComponentTagAttribute(type = {},
expression = DynamicExpression.METHOD_BINDING,
- methodSignature = { "javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object" })
+ methodSignature = {"javax.faces.context.FacesContext", "javax.faces.component.UIComponent", "java.lang.Object"})
public void setValidator(javax.el.MethodExpression validator) {
this.validator = validator;
}
@@ -379,7 +380,7 @@ public class InExtensionTag extends Toba
this.tip = tip;
}
- /**
+ /**
* The width for the label component. Default: 'auto'.
* This value is used in the gridLayouts columns attribute.
* See gridLayout tag for valid values.
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/TimeExtensionTag.java Wed Feb 1 09:41:12 2012
@@ -61,6 +61,7 @@ public class TimeExtensionTag extends To
private javax.el.MethodExpression valueChangeListener;
private javax.el.ValueExpression inline;
private javax.el.ValueExpression onchange;
+ private javax.el.ValueExpression markup;
private javax.el.ValueExpression labelWidth;
private javax.el.ValueExpression tabIndex;
private javax.el.ValueExpression validatorMessage;
@@ -91,6 +92,9 @@ public class TimeExtensionTag extends To
if (labelWidth != null) {
labelTag.setColumns(createStringValueExpression(labelWidth.getExpressionString() + ";*"));
}
+ if (markup != null) {
+ labelTag.setMarkup(markup);
+ }
labelTag.setParent(getParent());
labelTag.setJspId(jspId + PREFIX + idSuffix++);
labelTag.doStartTag();
@@ -136,6 +140,9 @@ public class TimeExtensionTag extends To
if (required != null) {
timeTag.setRequired(required);
}
+ if (markup != null) {
+ timeTag.setMarkup(markup);
+ }
if (tabIndex != null) {
timeTag.setTabIndex(tabIndex);
}
@@ -180,6 +187,7 @@ public class TimeExtensionTag extends To
value = null;
onchange = null;
valueChangeListener = null;
+ markup = null;
tabIndex = null;
timeTag = null;
labelTag = null;
@@ -190,6 +198,16 @@ public class TimeExtensionTag extends To
}
/**
+ * Indicate markup of this component.
+ * Possible value is 'none'. But this can be overridden in the theme.
+ */
+ @TagAttribute
+ @UIComponentTagAttribute(defaultValue = "none", type = "java.lang.String[]")
+ public void setMarkup(javax.el.ValueExpression markup) {
+ this.markup = markup;
+ }
+
+ /**
* The current value of this component.
*/
@TagAttribute
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<packaging>jar</packaging>
<name>Tobago JSF Compatibility</name>
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/src/main/java-jsf-1.1/javax/
('svn:mergeinfo' removed)
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeExpansionListener.java
('svn:mergeinfo' removed)
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/MethodExpressionTreeMarkedListener.java
('svn:mergeinfo' removed)
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeExpansionEvent.java
('svn:mergeinfo' removed)
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TreeMarkedEvent.java
('svn:mergeinfo' removed)
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Tobago Themes</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-charlotteville/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-charlotteville/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-charlotteville/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-charlotteville/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-charlotteville</artifactId>
<name>Tobago Theme Charlotteville</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-richmond/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-richmond/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-richmond/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-richmond/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-richmond</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-scarborough/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-scarborough</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-speyside</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/msie/style/style.css Wed Feb 1 09:41:12 2012
@@ -39,3 +39,10 @@
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; /* IE8 */
filter:alpha(opacity=50); /* IE6+IE7 */
}
+
+/* sheet ------------------------------------------------------------------ */
+
+.tobago-sheet-columnSelector {
+ padding: 1px 2px 3px 2px;
+ margin: -2px 0 -4px 0;
+}
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties Wed Feb 1 09:41:12 2012
@@ -98,10 +98,10 @@ SelectOneListbox.preferredHeight=75
Separator.height=14
Separator.withoutLabelHeight=1
-Sheet.headerHeight=20
-Sheet.footerHeight=15
+Sheet.headerHeight=21
+Sheet.footerHeight=16
Sheet.rowHeight=21
-Sheet.rowPadding=3
+Sheet.rowPadding=1
Sheet.selectorMenuWidth=16
Sheet.cellPaddingWidth=4
Sheet.borderLeft=1
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/style/style.css Wed Feb 1 09:41:12 2012
@@ -251,6 +251,7 @@
font: bold 12px arial, helvetica, sans-serif;
color: #000000;
text-decoration: none;
+ line-height: 14px;
}
.tobago-link-markup-disabled {
@@ -489,8 +490,9 @@ hr.tobago-separator, .tobago-separator-s
font: bold 10px arial, helvetica, sans-serif;
color: #333333;
text-decoration: none;
- padding: 0px;
+ padding: 0;
padding-top: 1px;
+ height: 15px;
}
.tobago-sheet-pagingOuter-markup-left {
@@ -692,6 +694,19 @@ div.tobago-tabGroup-toolBar {
width: 53px;
}
+.tobago-time-borderDiv-markup-readonly {
+ background-color: #E8E8E8;
+}
+
+.tobago-time-borderDiv-markup-disabled {
+ color: #808080;
+ background-color: #E8E8E8;
+}
+
+.tobago-time-borderDiv-markup-error, .tobago-time-borderDiv-markup-fatal {
+ border: 1px solid #FF0000;
+}
+
.tobago-time-borderDiv-markup-seconds {
width: 81px;
}
@@ -700,11 +715,9 @@ div.tobago-tabGroup-toolBar {
font-size: 12px;
height: 14px;
width: 21px;
- color: #000000;
}
.tobago-time-input-markup-selected {
- border-color: #E8E8E8;
background: #E8E8E8;
}
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-theme</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-theme-standard</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/tobago-config.xml Wed Feb 1 09:41:12 2012
@@ -245,6 +245,7 @@
<markup>selected</markup>
<!-- for the cells -->
<markup>clickable</markup>
+ <markup>filler</markup>
<markup>first</markup>
<markup>pure</markup>
<!-- internal: for the paging fields -->
@@ -286,6 +287,13 @@
<renderer>
<name>Time</name>
<supported-markup>
+ <markup>disabled</markup>
+ <markup>readonly</markup>
+ <markup>required</markup>
+ <markup>fatal</markup>
+ <markup>error</markup>
+ <markup>warn</markup>
+ <markup>info</markup>
<!-- internal: for the seconds field -->
<markup>seconds</markup>
</supported-markup>
Propchange: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/jquery-ui/
('svn:mergeinfo' removed)
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-sheet.js Wed Feb 1 09:41:12 2012
@@ -249,10 +249,10 @@ Tobago.Sheet.prototype.doKeyEvent = func
}
if (keyCode == 13) {
if (input.value != input.nextSibling.innerHTML) {
+ Tobago.stopEventPropagation(event);
+ event.returnValue = false;
this.reloadWithAction(event.srcElement, input.actionId);
- Tobago.stopEventPropagation(event);
- }
- else {
+ } else {
this.textInput = input;
this.hideInput();
}
@@ -290,6 +290,11 @@ Tobago.Sheet.prototype.setup = function(
jQuery(Tobago.Utils.escapeClientId(this.id) + ">div>table>colgroup>col").each(function() {
Tobago.Sheet.fixIE67ColWidth(jQuery(this));
});
+
+ // to avoid horizontal scroll bar. This value must be removed, when resizing the columns!
+ jQuery(Tobago.Utils.escapeClientId(this.id)).find(".tobago-sheet-cell-markup-filler").each(function() {
+ jQuery(this).css("width", "0");
+ });
}
this.adjustHeaderDiv();
@@ -373,7 +378,6 @@ Tobago.Sheet.prototype.addSelectionListe
currentSheet.getRows().each(function() {
var row = this;
Tobago.addBindEventListener(row, "mousedown", currentSheet, "doMouseDownSelect");
- Tobago.addBindEventListener(row, "mouseup", currentSheet, "doMouseUpSelect");
Tobago.addBindEventListener(row, "click", currentSheet, "doSelection");
if (currentSheet.dblClickActionId) {
Tobago.addBindEventListener(row, "dblclick", currentSheet, "doDblClick");
@@ -389,14 +393,6 @@ Tobago.Sheet.prototype.doMouseDownSelect
this.mouseDownY = event.clientY;
};
-Tobago.Sheet.prototype.doMouseUpSelect = function(event) {
- if (!event) {
- event = window.event;
- }
- this.mouseDownX = undefined;
- this.mouseDownY = undefined;
-};
-
Tobago.Sheet.prototype.doSelection = function(event) {
if (! event) {
event = window.event;
@@ -418,8 +414,7 @@ Tobago.Sheet.prototype.doSelection = fun
//LOG.debug("ID " + this.id);
if (srcElement.id.search(/_data_row_selector_/) > -1 || !Tobago.isInputElement(srcElement.tagName)) {
- if (this.mouseDownX != undefined &&
- Math.abs(this.mouseDownX - event.clientX) + Math.abs(this.mouseDownY - event.clientY) > 5) {
+ if (Math.abs(this.mouseDownX - event.clientX) + Math.abs(this.mouseDownY - event.clientY) > 5) {
// The user has moved the mouse. We assume, the user want to select some text inside the sheet,
// so we doesn't select the row.
return;
@@ -728,6 +723,10 @@ Tobago.Sheet.prototype.endResize = funct
if (jQuery.browser.msie && parseInt(jQuery.browser.version) <= 7) {
Tobago.Sheet.fixIE67ColWidth(col);
+
+ table.find(".tobago-sheet-cell-markup-filler").each(function() {
+ jQuery(this).css("width", "auto");
+ });
}
var index = parseInt(columnNr) + 1;
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Wed Feb 1 09:41:12 2012
@@ -256,7 +256,7 @@ var Tobago = {
this.page = this.element(pageId);
this.form = this.element(this.page.id + this.SUB_COMPONENT_SEP + 'form');
this.addBindEventListener(this.form, 'submit', this, 'onSubmit');
- this.action = this.element(this.form.id + '-action');
+ this.action = this.element(this.page.id + this.SUB_COMPONENT_SEP + 'form-action');
this.contextPath = this.element(this.page.id + this.SUB_COMPONENT_SEP + 'context-path');
this.blankPage = this.contextPath.value + '/org/apache/myfaces/tobago/renderkit/html/standard/blank.html';
this.actionPosition = this.element(this.page.id + this.SUB_COMPONENT_SEP + 'action-position');
@@ -325,7 +325,7 @@ var Tobago = {
this.form.removeChild(hidden);
}
this.isSubmit = true;
- var clientDimension = this.createInput('hidden', this.form.id + '-clientDimension');
+ var clientDimension = this.createInput('hidden', this.page.id + this.SUB_COMPONENT_SEP + 'form-clientDimension');
clientDimension.value = jQuery("body").width() + ';' + jQuery("body").height();
this.form.appendChild(clientDimension);
Tobago.onBeforeUnload();
@@ -563,7 +563,7 @@ var Tobago = {
}
Tobago.oldTransition = Tobago.transition;
Tobago.transition = transition && !options.target;
-// new
+
var onSubmitResult = Tobago.onSubmit();
if (onSubmitResult) {
try {
@@ -581,22 +581,8 @@ var Tobago = {
}
if (options.target || !transition || !onSubmitResult) {
this.isSubmit = false;
- Tobago.Transport.pageSubmited = false;
+ Tobago.Transport.pageSubmitted = false;
}
-// old
- /*
- Tobago.onSubmit();
- // LOG.debug("submit form with action: " + Tobago.action.value);
- Tobago.form.submit();
- Tobago.action.value = oldAction;
- if (target) {
- Tobago.form.target = oldTarget;
- }
- if (target || !transition) {
- this.isSubmit = false;
- Tobago.Transport.pageSubmited = false;
- }
- */
}
}, true);
},
@@ -1821,22 +1807,22 @@ Tobago.ScriptLoader = function(names, do
Tobago.Transport = {
requests: new Array(),
currentActionId: null,
- pageSubmited: false,
+ pageSubmitted: false,
ajaxTransport: undefined,
- hasTransport: function() {
+ initTransport: function() {
if (this.ajaxTransport === undefined) {
try {
new XMLHttpRequest();
- this.ajaxTransport = this.getAjaxTransport();
+ this.ajaxTransport = Tobago.Transport.JqueryTransport;
} catch (e) {
try {
new ActiveXObject('Msxml2.XMLHTTP');
- this.ajaxTransport = this.getAjaxTransport();
+ this.ajaxTransport = Tobago.Transport.JqueryTransport;
} catch (e) {
try {
new ActiveXObject('Microsoft.XMLHTTP');
- this.ajaxTransport = this.getAjaxTransport();
+ this.ajaxTransport = Tobago.Transport.JqueryTransport;
} catch (e) {
this.ajaxTransport = false;
}
@@ -1849,10 +1835,10 @@ Tobago.Transport = {
request: function(req, submitPage, actionId) {
var index = 0;
if (submitPage) {
- this.pageSubmited = true;
+ this.pageSubmitted = true;
index = this.requests.push(req);
//LOG.debug('index = ' + index)
- } else if (!this.pageSubmited) { // AJAX case
+ } else if (!this.pageSubmitted) { // AJAX case
LOG.debug('Current ActionId = ' + this.currentActionId + ' action= ' + actionId); // @DEV_ONLY
if (actionId && this.currentActionId == actionId) {
LOG.debug('Ignoring request'); // @DEV_ONLY
@@ -1885,25 +1871,9 @@ Tobago.Transport = {
this.startTime = new Date().getTime();
this.requests[0]();
}
- },
-
- getAjaxTransport: function() {
- try {
- if (jQuery && typeof jQuery.ajax == 'function') {
- return Tobago.Transport.JqueryTransport;
- }
- } catch (e) {
- }
- try {
- if (dojo && typeof dojo.xhrPost == 'function') {
- return Tobago.Transport.DojoTransport;
- }
- } catch (e) {
- }
}
};
-
Tobago.Transport.JqueryTransport = {
transportOptions: {
@@ -1942,78 +1912,17 @@ Tobago.Transport.JqueryTransport = {
};
return Tobago.Transport.request(function() {
- requestOptions.oldValue = Tobago.action.value;
+ requestOptions.originalAction = Tobago.action.value;
requestObject.url = requestOptions.url;
Tobago.action.value = requestOptions.actionId;
Tobago.partialRequestIds.value = requestOptions.ajaxComponentIds;
requestObject.data = jQuery(Tobago.form).serialize();
requestOptions.xhr = jQuery.ajax(requestObject);
+ Tobago.action.value = requestOptions.originalAction;
}, false, requestOptions.actionId);
}
};
-Tobago.Transport.DojoTransport = {
-
- transportOptions: {
-
- handleAs: 'json'
-
- },
-
- request: function(requestOptions) {
-
- var requestObject = Tobago.extend({}, this.transportOptions);
-
- requestObject.timeout = requestOptions.timeout;
-
- requestObject.load = function(data, ioArgs) {
- LOG.debug('requestObject.success()'); // @DEV_ONLY
- requestOptions.resultData = data;
- requestOptions.xhr = ioArgs.xhr;
- try {
- if (ioArgs.xhr.status === 200) {
- requestOptions.textStatus = 'success';
- Tobago.Updater.onSuccess(requestOptions);
- return;
- } else if (ioArgs.xhr.status === 304) {
- requestOptions.textStatus = 'notmodified';
- Tobago.Updater.onSuccess(requestOptions);
- return;
- }
-
- } catch (e) {
-
- }
- Tobago.Updater.onError(requestOptions);
- };
-
-
- return Tobago.Transport.request(function() {
- requestOptions.oldValue = Tobago.action.value;
- requestObject.url = requestOptions.url;
- requestObject.form = Tobago.form.id;
- Tobago.action.value = requestOptions.actionId;
- Tobago.partialRequestIds.value = requestOptions.ajaxComponentIds;
- dojo.xhrPost(requestObject);
- }, false, requestOptions.actionId);
- },
-
- error: function(data, ioArgs) {
- LOG.error('Request failed : ' + ioArgs.xhr.status); // @DEV_ONLY
- requestOptions.xhr = ioArgs.xhr;
- if (ioArgs.xhr.status == 304) {
- requestOptions.textStatus = 'notmodified';
- Tobago.Updater.onSuccess(requestOptions);
- } else {
- requestOptions.textStatus = 'error';
- Tobago.Updater.onError(requestOptions);
- }
- Tobago.Transport.requestComplete();
- return data;
- }
-
-};
-
function tobago_showHidden() {
for (var i = 0; i < document.forms.length; i++) {
var form = document.forms[i];
@@ -2084,8 +1993,7 @@ Tobago.Updater = {
// LOG.show();
LOG.debug('Updater.update(\"' + actionId + '\", \"' + ajaxComponentIds + '\")'); // @DEV_ONLY
- if (Tobago.Transport.hasTransport()) {
-// LOG.info("hasTransport");
+ if (Tobago.Transport.initTransport()) {
if (jQuery.isFunction(Tobago.applicationOnsubmit)) {
var result = Tobago.applicationOnsubmit();
@@ -2274,6 +2182,14 @@ Tobago.Updater = {
Tobago.Updater.doUpdate(componentData);
}
}
+
+ /* TOBAGO-1087: Wait Cursor after AJAX in IE with Websphere 6.1 */
+ if (jQuery.browser.msie) {
+ var body = jQuery("body");
+ var originalCursor = body.css("cursor");
+ body.css("cursor", "default");
+ body.css("cursor", originalCursor);
+ }
},
doUpdate: function(data) {
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-tool/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-tool/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-tool/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-tool/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<packaging>pom</packaging>
<name>Tobago Tool</name>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-annotation/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-tool-annotation</artifactId>
<packaging>jar</packaging>
Modified: myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml?rev=1239023&r1=1239022&r2=1239023&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml (original)
+++ myfaces/tobago/branches/tobago-tree-table/tobago-tool/tobago-tool-apt/pom.xml Wed Feb 1 09:41:12 2012
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-tool</artifactId>
- <version>1.5.2-SNAPSHOT</version>
+ <version>1.5.3-SNAPSHOT</version>
</parent>
<artifactId>tobago-tool-apt</artifactId>
<packaging>jar</packaging>