Permalink
Browse files

Merge branch 'release/4.2.2.Final'

  • Loading branch information...
2 parents 9f6bee6 + ce9f610 commit b24b05ee0779002db08fd0f9fb8cd28df1c85a9c @bleathem bleathem committed May 14, 2012
Showing with 98 additions and 54 deletions.
  1. +1 −1 common/api/pom.xml
  2. +1 −1 common/pom.xml
  3. +1 −1 common/ui/pom.xml
  4. +1 −1 core/api/pom.xml
  5. +2 −1 core/api/src/main/java/org/richfaces/component/LogMode.java
  6. +1 −1 core/pom.xml
  7. +1 −1 core/ui/pom.xml
  8. +1 −1 core/ui/src/main/java/org/ajax4jsf/component/behavior/MethodExpressionAjaxBehaviorListener.java
  9. +7 −2 core/ui/src/main/java/org/richfaces/view/facelets/tag/AjaxBehaviorRule.java
  10. +8 −1 core/ui/src/main/resources/META-INF/resources/org.richfaces/log.js
  11. +1 −1 dist/pom.xml
  12. +1 −1 dist/richfaces-components-api/pom.xml
  13. +1 −1 dist/richfaces-components-ui/pom.xml
  14. +1 −1 dist/static-resources/pom.xml
  15. +1 −1 dnd/api/pom.xml
  16. +1 −1 dnd/pom.xml
  17. +1 −1 dnd/ui/pom.xml
  18. +1 −1 input/api/pom.xml
  19. +1 −1 input/pom.xml
  20. +1 −1 input/ui/pom.xml
  21. +1 −1 iteration/api/pom.xml
  22. +1 −1 iteration/pom-tables.xml
  23. +1 −1 iteration/pom.xml
  24. +1 −1 iteration/ui/pom-list.xml
  25. +1 −1 iteration/ui/pom.xml
  26. +1 −1 iteration/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
  27. +4 −1 iteration/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
  28. +1 −1 iteration/ui/src/main/resources/META-INF/resources/org.richfaces/extendedDataTable.js
  29. +1 −1 misc/pom.xml
  30. +1 −1 misc/ui/pom.xml
  31. +1 −1 mobile-compatibility/README
  32. +1 −1 output/api/pom.xml
  33. +1 −1 output/pom.xml
  34. +1 −1 output/ui/pom.xml
  35. +1 −1 output/ui/src/main/java/org/richfaces/component/AbstractTooltip.java
  36. +18 −3 output/ui/src/main/java/org/richfaces/renderkit/html/TooltipRenderer.java
  37. +0 −3 output/ui/src/test/resources/org/richfaces/renderkit/html/tooltip.xmlunit.xml
  38. +1 −1 parent/pom.xml
  39. +1 −1 pom.xml
  40. +1 −1 validator/api/pom.xml
  41. +1 −1 validator/pom.xml
  42. +1 −1 validator/ui/pom.xml
  43. +7 −4 validator/ui/src/main/java/org/richfaces/component/AbstractNotify.java
  44. +5 −1 validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java
  45. +0 −1 validator/ui/src/main/resources/META-INF/resources/org.richfaces/msg.ecss
  46. +8 −1 validator/ui/src/main/resources/META-INF/resources/org.richfaces/notify.js
  47. +1 −0 validator/ui/src/main/templates/notify.template.xml
  48. +1 −0 validator/ui/src/main/templates/notifyMessage.template.xml
  49. +1 −0 validator/ui/src/main/templates/notifyMessages.template.xml
View
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
View
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-root-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../build/parent/pom.xml</relativePath>
</parent>
View
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
View
@@ -21,7 +21,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -28,6 +28,7 @@
public enum LogMode {
popup,
- inline;
+ inline,
+ console;
public static final LogMode DEFAULT = inline;
}
View
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-root-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../build/parent/pom.xml</relativePath>
</parent>
View
@@ -23,7 +23,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -55,7 +55,7 @@ public MethodExpressionAjaxBehaviorListener(MethodExpression methodExpressionOne
ACTION_LISTENER_ZEROARG_SIG);
}
- MethodExpressionAjaxBehaviorListener(MethodExpression methodExpressionOneArg, MethodExpression methodExpressionZeroArg) {
+ public MethodExpressionAjaxBehaviorListener(MethodExpression methodExpressionOneArg, MethodExpression methodExpressionZeroArg) {
this.methodExpressionOneArg = methodExpressionOneArg;
this.methodExpressionZeroArg = methodExpressionZeroArg;
}
@@ -21,6 +21,7 @@
*/
package org.richfaces.view.facelets.tag;
+import javax.el.MethodExpression;
import javax.faces.event.AjaxBehaviorEvent;
import javax.faces.view.facelets.FaceletContext;
import javax.faces.view.facelets.Metadata;
@@ -37,6 +38,7 @@
*/
public class AjaxBehaviorRule extends BehaviorRule {
public static final Class<?>[] AJAX_BEHAVIOR_LISTENER_SIG = new Class[] { AjaxBehaviorEvent.class };
+ private static final Class<?>[] AJAX_BEHAVIOR_ZEROARG_SIG = new Class[] {};
public static final AjaxBehaviorRule INSTANCE = new AjaxBehaviorRule();
public static final String EXECUTE = "execute";
public static final String RENDER = "render";
@@ -80,8 +82,11 @@ public AjaxBehaviorListenerMapper(TagAttribute attr) {
}
public void applyMetadata(FaceletContext ctx, Object instance) {
- ((AjaxClientBehavior) instance).addAjaxBehaviorListener(new MethodExpressionAjaxBehaviorListener(this.attr
- .getMethodExpression(ctx, null, AjaxBehaviorRule.AJAX_BEHAVIOR_LISTENER_SIG)));
+ MethodExpression methodExpressionOneArg = this.attr
+ .getMethodExpression(ctx, null, AjaxBehaviorRule.AJAX_BEHAVIOR_LISTENER_SIG);
+ MethodExpression methodExpressionZeroArg = this.attr
+ .getMethodExpression(ctx, null, AjaxBehaviorRule.AJAX_BEHAVIOR_ZEROARG_SIG);
+ ((AjaxClientBehavior) instance).addAjaxBehaviorListener(new MethodExpressionAjaxBehaviorListener(methodExpressionOneArg, methodExpressionZeroArg));
}
}
}
@@ -147,6 +147,11 @@
__log: function(level, message) {
//TODO scroll to the added message
//TODO check popup is opened
+ if (this.mode == 'console') {
+ console[level]('RichFaces: ' + message);
+ return;
+ }
+
if (!this.__contentsElement) {
return;
}
@@ -179,7 +184,9 @@
this.hotkey = options.hotkey;
this.mode = (options.mode || 'inline');
- if (this.mode == 'popup') {
+ if (this.mode == 'console') {
+ // do nothing
+ } else if (this.mode == 'popup') {
this.__boundHotkeyHandler = jquery.proxy(this.__hotkeyHandler, this);
jquery(document).bind('keydown', this.__boundHotkeyHandler);
} else {
View
@@ -23,7 +23,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-root-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../build/parent/pom.xml</relativePath>
</parent>
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
View
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
View
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-root-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../build/parent/pom.xml</relativePath>
</parent>
View
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
View
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
View
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-root-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../build/parent/pom.xml</relativePath>
</parent>
View
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
View
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
View
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces.ui.iteration</groupId>
<artifactId>richfaces-ui-iteration-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
View
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-root-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../build/parent/pom.xml</relativePath>
</parent>
@@ -22,7 +22,7 @@
<parent>
<groupId>org.richfaces.ui.iteration</groupId>
<artifactId>lists-aggregator</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../pom.xml</relativePath>
</parent>
View
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -108,7 +108,7 @@ protected void doDecode(FacesContext context, final UIComponent component) {
Map<String, String> parametersMap = context.getExternalContext().getRequestParameterMap();
final String behaviorEvent = parametersMap.get(BEHAVIOR_EVENT_NAME);
- if (!behaviorEvent.startsWith(ROW)) {
+ if (behaviorEvent == null || !behaviorEvent.startsWith(ROW)) {
return;
}
@@ -533,6 +533,7 @@ public void encodeMetaComponent(FacesContext context, UIComponent component, Str
table.captureOrigValue(context);
table.setRowKey(context, null);
final RendererState state = createRowHolder(context, table, null);
+ state.setCurrentRow(addRange.getFirstRow());
String clientId = table.getClientId(context);
// TODO 1. Encode fixed children
for (state.startIterate(); state.hasNextPart();) {
@@ -561,9 +562,11 @@ public DataVisitResult process(FacesContext context, Object rowKey, Object argum
} catch (IOException e) {
throw new FacesException(e);
}
+ RowHolderBase holder = (RowHolderBase) argument;
+ holder.nextRow();
return DataVisitResult.CONTINUE;
}
- }, addRange, null);
+ }, addRange, state);
writer.startEval();
if (difference < 0) {
difference += clientRows;
@@ -638,7 +638,7 @@
},
onbeforeselectionchange: function (event) {
- return !this.options.onbeforeselectionchange || this.options.onbeforeselectionchange.call(this.element, event) !== false;
+ return !this.options.onbeforeselectionchange || this.options.onbeforeselectionchange.call(this.element, event) != false;
},
onselectionchange: function (event, index, changed) {
View
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-root-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../build/parent/pom.xml</relativePath>
</parent>
View
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -1,4 +1,4 @@
-SlidFast is a minimalistic approach to writing mobile web apps with RichFaces 4.2.1.Final.
+SlidFast is a minimalistic approach to writing mobile web apps with RichFaces 4.2.2.Final.
It utilizes core HTML5 APIs for WebKit based web browsers.
Include the slidfast.js, slidfast.css and rf-mobile-skin.css files in your project, then initialize with:
View
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
View
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-root-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../build/parent/pom.xml</relativePath>
</parent>
View
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui-parent</artifactId>
- <version>4.2.1.Final</version>
+ <version>4.2.2.Final</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -113,7 +113,7 @@ public void setTarget(String target) {
public abstract Positioning getDirection();
/**
- * If "true" tooltip should follow the mouse while it moves over the parent element. Default value is "false"
+ * If "true" tooltip should follow the mouse while it moves over the parent element. Default value is "true"
*/
@Attribute(defaultValue = "true")
public abstract boolean isFollowMouse();
Oops, something went wrong.

0 comments on commit b24b05e

Please sign in to comment.