You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/06/01 17:00:57 UTC
svn commit: r1130174 -
/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/
Author: lu4242
Date: Wed Jun 1 15:00:55 2011
New Revision: 1130174
URL: http://svn.apache.org/viewvc?rev=1130174&view=rev
Log:
TOMAHAWK-1587 Add s:effectXXX client behaviors based on script.aculo.us library (add js callbacks)
Added:
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/JsEffectCallbackTarget.java
Modified:
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectAppearClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectBlindDownClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectBlindUpClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectDropOutClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectFadeClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectFoldClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectGrowClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectHideClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectHighlightClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectMorphClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectMoveClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectOpacityClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectPuffClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectPulsateClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectScaleClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectScrollToClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShakeClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShowClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShrinkClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSlideDownClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSlideUpClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSquishClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSwitchOffClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectToggleClientBehavior.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectAppearClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectBlindDownClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectBlindUpClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectClientBehaviorBase.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectFadeClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectGrowClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectHighlightClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectMorphClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectMoveClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectOpacityClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectPuffClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectPulsateClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectScaleClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectScrollToClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectShakeClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectShrinkClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectSlideDownClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectSlideUpClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectToggleClientBehaviorRenderer.java
myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectUtils.java
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectAppearClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectAppearClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectAppearClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectAppearClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectAppearBehavior",
bodyContent="empty")
public abstract class AbstractEffectAppearClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectAppearBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectAppearBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectBlindDownClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectBlindDownClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectBlindDownClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectBlindDownClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.BlindDown
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectBlindDownBehavior",
bodyContent="empty")
public abstract class AbstractEffectBlindDownClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectBlindDownBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectBlindDownBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectBlindUpClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectBlindUpClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectBlindUpClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectBlindUpClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.BlindUp
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectBlindUpBehavior",
bodyContent="empty")
public abstract class AbstractEffectBlindUpClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectBlindUpBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectBlindUpBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectDropOutClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectDropOutClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectDropOutClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectDropOutClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.DropOut
*
* @author Leonardo Uribe
*
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectFadeClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectFadeClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectFadeClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectFadeClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectFadeBehavior",
bodyContent="empty")
public abstract class AbstractEffectFadeClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectFadeBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectFadeBehavior";
@@ -64,4 +65,5 @@ public abstract class AbstractEffectFade
*/
@JSFProperty
public abstract Float getTo();
+
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectFoldClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectFoldClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectFoldClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectFoldClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Fold
*
* @author Leonardo Uribe
*
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectGrowClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectGrowClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectGrowClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectGrowClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Grow
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectGrowBehavior",
bodyContent="empty")
public abstract class AbstractEffectGrowClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectGrowBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectGrowBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectHideClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectHideClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectHideClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectHideClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Fade
+ * Convenient wrapper for scriptaculous Element.hide
*
* @author Leonardo Uribe
*
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectHighlightClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectHighlightClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectHighlightClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectHighlightClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Highlight
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectHighlightBehavior",
bodyContent="empty")
public abstract class AbstractEffectHighlightClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectHighlightBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectHighlightBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectMorphClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectMorphClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectMorphClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectMorphClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Morph
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectMorphBehavior",
bodyContent="empty")
public abstract class AbstractEffectMorphClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectMorphBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectMorphBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectMoveClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectMoveClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectMoveClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectMoveClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Move
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectMoveBehavior",
bodyContent="empty")
public abstract class AbstractEffectMoveClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectMoveBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectMoveBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectOpacityClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectOpacityClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectOpacityClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectOpacityClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Opacity
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectOpacityBehavior",
bodyContent="empty")
public abstract class AbstractEffectOpacityClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectOpacityBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectOpacityBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectPuffClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectPuffClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectPuffClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectPuffClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Puff
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectPuffBehavior",
bodyContent="empty")
public abstract class AbstractEffectPuffClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectPuffBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectPuffBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectPulsateClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectPulsateClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectPulsateClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectPulsateClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Pulsate
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectPulsateBehavior",
bodyContent="empty")
public abstract class AbstractEffectPulsateClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectPulsateBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectPulsateBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectScaleClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectScaleClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectScaleClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectScaleClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Scale
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectScaleBehavior",
bodyContent="empty")
public abstract class AbstractEffectScaleClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectScaleBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectScaleBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectScrollToClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectScrollToClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectScrollToClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectScrollToClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -20,10 +20,9 @@ package org.apache.myfaces.custom.effect
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFClientBehavior;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
-import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.ScrollTo
*
* @author Leonardo Uribe
*
@@ -33,6 +32,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectScrollToBehavior",
bodyContent="empty")
public abstract class AbstractEffectScrollToClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectScrollToBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectScrollToBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShakeClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShakeClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShakeClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShakeClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Shake
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectShakeBehavior",
bodyContent="empty")
public abstract class AbstractEffectShakeClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectShakeBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectShakeBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShowClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShowClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShowClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShowClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Fade
+ * Convenient wrapper for scriptaculous Element.show
*
* @author Leonardo Uribe
*
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShrinkClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShrinkClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShrinkClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectShrinkClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Shrink
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectShrinkBehavior",
bodyContent="empty")
public abstract class AbstractEffectShrinkClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectShrinkBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectShrinkBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSlideDownClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSlideDownClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSlideDownClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSlideDownClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.SlideDown
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectSlideDownBehavior",
bodyContent="empty")
public abstract class AbstractEffectSlideDownClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectSlideDownBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectSlideDownBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSlideUpClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSlideUpClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSlideUpClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSlideUpClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.SlideUp
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectSlideUpBehavior",
bodyContent="empty")
public abstract class AbstractEffectSlideUpClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectSlideUpBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectSlideUpBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSquishClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSquishClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSquishClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSquishClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Squish
*
* @author Leonardo Uribe
*
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSwitchOffClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSwitchOffClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSwitchOffClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectSwitchOffClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.SwitchOff
*
* @author Leonardo Uribe
*
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectToggleClientBehavior.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectToggleClientBehavior.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectToggleClientBehavior.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/AbstractEffectToggleClientBehavior.java Wed Jun 1 15:00:55 2011
@@ -23,7 +23,7 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous Effect.Toggle
*
* @author Leonardo Uribe
*
@@ -33,6 +33,7 @@ import org.apache.myfaces.custom.behavio
clazz="org.apache.myfaces.custom.effect.EffectToggleBehavior",
bodyContent="empty")
public abstract class AbstractEffectToggleClientBehavior extends EffectClientBehaviorBase
+ implements JsEffectCallbackTarget
{
public static final String BEHAVIOR_ID = "org.apache.myfaces.custom.effect.EffectToggleBehavior";
public static final String RENDERER_TYPE = "org.apache.myfaces.custom.effect.EffectToggleBehavior";
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectAppearClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectAppearClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectAppearClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectAppearClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,13 +60,20 @@ public class EffectAppearClientBehaviorR
sb.append("new Effect.Appear('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getFrom() != null || effectBehavior.getTo() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getFrom(),
+ effectBehavior.getTo(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
addComma = EffectUtils.addProperty(sb, "from", effectBehavior.getFrom(), addComma);
addComma = EffectUtils.addProperty(sb, "to", effectBehavior.getTo(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectBlindDownClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectBlindDownClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectBlindDownClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectBlindDownClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -61,9 +61,17 @@ public class EffectBlindDownClientBehavi
sb.append("new Effect.BlindDown('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getScaleX() != null || effectBehavior.getScaleY() != null ||
- effectBehavior.getScaleMode() != null || effectBehavior.getScaleFromCenter() != null || effectBehavior.getScaleContent() != null ||
- effectBehavior.getScaleFrom() != null || effectBehavior.getScaleTo() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getScaleX(),
+ effectBehavior.getScaleY(),
+ effectBehavior.getScaleMode(),
+ effectBehavior.getScaleFromCenter(),
+ effectBehavior.getScaleContent(),
+ effectBehavior.getScaleFrom(),
+ effectBehavior.getScaleTo(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
@@ -75,6 +83,8 @@ public class EffectBlindDownClientBehavi
addComma = EffectUtils.addProperty(sb, "scaleFrom", effectBehavior.getScaleFrom(), addComma);
addComma = EffectUtils.addProperty(sb, "scaleTo", effectBehavior.getScaleTo(), addComma);
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
sb.append(')');
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectBlindUpClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectBlindUpClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectBlindUpClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectBlindUpClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -61,9 +61,17 @@ public class EffectBlindUpClientBehavior
sb.append("new Effect.BlindUp('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getScaleX() != null || effectBehavior.getScaleY() != null ||
- effectBehavior.getScaleMode() != null || effectBehavior.getScaleFromCenter() != null || effectBehavior.getScaleContent() != null ||
- effectBehavior.getScaleFrom() != null || effectBehavior.getScaleTo() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getScaleX(),
+ effectBehavior.getScaleY(),
+ effectBehavior.getScaleMode(),
+ effectBehavior.getScaleFromCenter(),
+ effectBehavior.getScaleContent(),
+ effectBehavior.getScaleFrom(),
+ effectBehavior.getScaleTo(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
@@ -75,6 +83,8 @@ public class EffectBlindUpClientBehavior
addComma = EffectUtils.addProperty(sb, "scaleFrom", effectBehavior.getScaleFrom(), addComma);
addComma = EffectUtils.addProperty(sb, "scaleTo", effectBehavior.getScaleTo(), addComma);
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
sb.append(')');
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectClientBehaviorBase.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectClientBehaviorBase.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectClientBehaviorBase.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectClientBehaviorBase.java Wed Jun 1 15:00:55 2011
@@ -21,10 +21,9 @@ package org.apache.myfaces.custom.effect
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFClientBehavior;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
import org.apache.myfaces.custom.behavior.ClientBehaviorBase;
-import org.apache.myfaces.custom.effect.EffectAppearBehavior.PropertyKeys;
/**
- * Convenient wrapper for scriptaculous Effect.Appear
+ * Convenient wrapper for scriptaculous. The properties here are common to all effects
*
* @author Leonardo Uribe
*
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectFadeClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectFadeClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectFadeClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectFadeClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,13 +60,20 @@ public class EffectFadeClientBehaviorRen
sb.append("new Effect.Fade('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getFrom() != null || effectBehavior.getTo() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getDuration(),
+ effectBehavior.getFrom(),
+ effectBehavior.getTo(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
addComma = EffectUtils.addProperty(sb, "from", effectBehavior.getFrom(), addComma);
addComma = EffectUtils.addProperty(sb, "to", effectBehavior.getTo(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectGrowClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectGrowClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectGrowClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectGrowClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,12 +60,18 @@ public class EffectGrowClientBehaviorRen
sb.append("new Effect.Grow('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getDirection() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getDirection(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
addComma = EffectUtils.addStringProperty(sb, "direction", effectBehavior.getDirection(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectHighlightClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectHighlightClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectHighlightClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectHighlightClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,8 +60,13 @@ public class EffectHighlightClientBehavi
sb.append("new Effect.Highlight('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getKeepBackgroundImage() != null || effectBehavior.getRestorecolor() != null ||
- effectBehavior.getStartcolor() != null || effectBehavior.getEndcolor() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getKeepBackgroundImage(),
+ effectBehavior.getRestorecolor(),
+ effectBehavior.getStartcolor(),
+ effectBehavior.getEndcolor(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
@@ -69,6 +74,8 @@ public class EffectHighlightClientBehavi
addComma = EffectUtils.addStringProperty(sb, "restorecolor", effectBehavior.getRestorecolor(), addComma);
addComma = EffectUtils.addStringProperty(sb, "startcolor", effectBehavior.getStartcolor(), addComma);
addComma = EffectUtils.addStringProperty(sb, "endcolor", effectBehavior.getEndcolor(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectMorphClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectMorphClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectMorphClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectMorphClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,11 +60,14 @@ public class EffectMorphClientBehaviorRe
sb.append("new Effect.Morph('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getStyle() != null)
+ if (effectBehavior.getStyle() != null ||
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addStringProperty(sb, "style", effectBehavior.getStyle(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectMoveClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectMoveClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectMoveClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectMoveClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,13 +60,20 @@ public class EffectMoveClientBehaviorRen
sb.append("new Effect.Move('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getMode() != null || effectBehavior.getX() != null || effectBehavior.getY() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getMode(),
+ effectBehavior.getX(),
+ effectBehavior.getY(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addStringProperty(sb, "mode", effectBehavior.getMode(), addComma);
addComma = EffectUtils.addProperty(sb, "x", effectBehavior.getX(), addComma);
addComma = EffectUtils.addProperty(sb, "y", effectBehavior.getY(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectOpacityClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectOpacityClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectOpacityClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectOpacityClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,13 +60,20 @@ public class EffectOpacityClientBehavior
sb.append("new Effect.Opacity('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getFrom() != null || effectBehavior.getTo() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getFrom(),
+ effectBehavior.getTo(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
addComma = EffectUtils.addProperty(sb, "from", effectBehavior.getFrom(), addComma);
addComma = EffectUtils.addProperty(sb, "to", effectBehavior.getTo(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectPuffClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectPuffClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectPuffClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectPuffClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,13 +60,20 @@ public class EffectPuffClientBehaviorRen
sb.append("new Effect.Puff('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getFrom() != null || effectBehavior.getTo() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getFrom(),
+ effectBehavior.getTo(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
addComma = EffectUtils.addProperty(sb, "from", effectBehavior.getFrom(), addComma);
addComma = EffectUtils.addProperty(sb, "to", effectBehavior.getTo(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectPulsateClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectPulsateClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectPulsateClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectPulsateClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,13 +60,20 @@ public class EffectPulsateClientBehavior
sb.append("new Effect.Pulsate('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getFrom() != null || effectBehavior.getPulses() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getFrom(),
+ effectBehavior.getPulses(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
addComma = EffectUtils.addProperty(sb, "from", effectBehavior.getFrom(), addComma);
addComma = EffectUtils.addProperty(sb, "to", effectBehavior.getPulses(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectScaleClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectScaleClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectScaleClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectScaleClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -65,9 +65,15 @@ public class EffectScaleClientBehaviorRe
sb.append(effectBehavior.getPercent() == null ? 100 : effectBehavior.getPercent());
sb.append('\'');
- if (effectBehavior.getScaleX() != null || effectBehavior.getScaleY() != null ||
- effectBehavior.getScaleMode() != null || effectBehavior.getScaleFromCenter() != null || effectBehavior.getScaleContent() != null ||
- effectBehavior.getScaleFrom() != null )
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getScaleX(),
+ effectBehavior.getScaleY(),
+ effectBehavior.getScaleMode(),
+ effectBehavior.getScaleFromCenter(),
+ effectBehavior.getScaleContent(),
+ effectBehavior.getScaleFrom(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
@@ -77,6 +83,9 @@ public class EffectScaleClientBehaviorRe
addComma = EffectUtils.addProperty(sb, "scaleFromCenter", effectBehavior.getScaleFromCenter(), addComma);
addComma = EffectUtils.addProperty(sb, "scaleContent", effectBehavior.getScaleContent(), addComma);
addComma = EffectUtils.addProperty(sb, "scaleFrom", effectBehavior.getScaleFrom(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
+
sb.append('}');
}
sb.append(')');
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectScrollToClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectScrollToClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectScrollToClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectScrollToClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,12 +60,18 @@ public class EffectScrollToClientBehavio
sb.append("new Effect.ScrollTo('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getOffset() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getOffset(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
addComma = EffectUtils.addProperty(sb, "offset", effectBehavior.getOffset(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectShakeClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectShakeClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectShakeClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectShakeClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,12 +60,18 @@ public class EffectShakeClientBehaviorRe
sb.append("new Effect.Shake('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getDistance() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getDistance(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
addComma = EffectUtils.addProperty(sb, "distance", effectBehavior.getDistance(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectShrinkClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectShrinkClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectShrinkClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectShrinkClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,12 +60,18 @@ public class EffectShrinkClientBehaviorR
sb.append("new Effect.Shrink('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getDirection() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getDirection(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
addComma = EffectUtils.addStringProperty(sb, "direction", effectBehavior.getDirection(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
sb.append('}');
}
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectSlideDownClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectSlideDownClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectSlideDownClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectSlideDownClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -60,9 +60,17 @@ public class EffectSlideDownClientBehavi
sb.append("new Effect.SlideDown('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getScaleX() != null || effectBehavior.getScaleY() != null ||
- effectBehavior.getScaleMode() != null || effectBehavior.getScaleFromCenter() != null || effectBehavior.getScaleContent() != null ||
- effectBehavior.getScaleFrom() != null || effectBehavior.getScaleTo() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getScaleX(),
+ effectBehavior.getScaleY(),
+ effectBehavior.getScaleMode(),
+ effectBehavior.getScaleFromCenter(),
+ effectBehavior.getScaleContent(),
+ effectBehavior.getScaleFrom(),
+ effectBehavior.getScaleTo(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
@@ -74,6 +82,9 @@ public class EffectSlideDownClientBehavi
addComma = EffectUtils.addProperty(sb, "scaleFrom", effectBehavior.getScaleFrom(), addComma);
addComma = EffectUtils.addProperty(sb, "scaleTo", effectBehavior.getScaleTo(), addComma);
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
+
sb.append('}');
}
sb.append(')');
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectSlideUpClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectSlideUpClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectSlideUpClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectSlideUpClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -61,9 +61,17 @@ public class EffectSlideUpClientBehavior
sb.append("new Effect.SlideUp('");
sb.append(clientId);
sb.append("'");
- if (effectBehavior.getScaleX() != null || effectBehavior.getScaleY() != null ||
- effectBehavior.getScaleMode() != null || effectBehavior.getScaleFromCenter() != null || effectBehavior.getScaleContent() != null ||
- effectBehavior.getScaleFrom() != null || effectBehavior.getScaleTo() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getScaleX(),
+ effectBehavior.getScaleY(),
+ effectBehavior.getScaleMode(),
+ effectBehavior.getScaleFromCenter(),
+ effectBehavior.getScaleContent(),
+ effectBehavior.getScaleFrom(),
+ effectBehavior.getScaleTo(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
@@ -75,6 +83,9 @@ public class EffectSlideUpClientBehavior
addComma = EffectUtils.addProperty(sb, "scaleFrom", effectBehavior.getScaleFrom(), addComma);
addComma = EffectUtils.addProperty(sb, "scaleTo", effectBehavior.getScaleTo(), addComma);
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
+
sb.append('}');
}
sb.append(')');
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectToggleClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectToggleClientBehaviorRenderer.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectToggleClientBehaviorRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectToggleClientBehaviorRenderer.java Wed Jun 1 15:00:55 2011
@@ -65,12 +65,19 @@ public class EffectToggleClientBehaviorR
sb.append(effectBehavior.getMode());
sb.append('\'');
- if (effectBehavior.getDelay() != null || effectBehavior.getDuration() != null)
+ if (EffectUtils.isAnyPropertySet(
+ effectBehavior.getDelay(),
+ effectBehavior.getDuration(),
+ EffectUtils.isAnyJsEffectCallbackTargetPropertySet(effectBehavior)
+ ))
{
sb.append(",{");
boolean addComma = false;
addComma = EffectUtils.addProperty(sb, "delay", effectBehavior.getDelay(), addComma);
addComma = EffectUtils.addProperty(sb, "duration", effectBehavior.getDuration(), addComma);
+ //Javascript callbacks
+ addComma = EffectUtils.addJSCallbacks(sb, effectBehavior, addComma);
+
sb.append('}');
}
sb.append(')');
Modified: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectUtils.java?rev=1130174&r1=1130173&r2=1130174&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectUtils.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/EffectUtils.java Wed Jun 1 15:00:55 2011
@@ -59,6 +59,40 @@ public class EffectUtils
{
return addComma;
}
- }
+ }
+
+ public static boolean addJSCallbacks(StringBuilder sb, JsEffectCallbackTarget effectBehavior, boolean addComma)
+ {
+ addComma = EffectUtils.addProperty(sb, "beforeStart", effectBehavior.getBeforeStart(), addComma);
+ addComma = EffectUtils.addProperty(sb, "beforeSetup", effectBehavior.getBeforeSetup(), addComma);
+ addComma = EffectUtils.addProperty(sb, "afterSetup", effectBehavior.getAfterSetup(), addComma);
+ addComma = EffectUtils.addProperty(sb, "beforeUpdate", effectBehavior.getBeforeUpdate(), addComma);
+ addComma = EffectUtils.addProperty(sb, "afterUpdate", effectBehavior.getAfterUpdate(), addComma);
+ addComma = EffectUtils.addProperty(sb, "afterFinish", effectBehavior.getAfterFinish(), addComma);
+ return addComma;
+ }
+
+ public static boolean isAnyJsEffectCallbackTargetPropertySet(JsEffectCallbackTarget effectBehavior)
+ {
+ return isAnyPropertySet(
+ effectBehavior.getBeforeStart(),
+ effectBehavior.getBeforeSetup(),
+ effectBehavior.getAfterSetup(),
+ effectBehavior.getBeforeUpdate(),
+ effectBehavior.getAfterUpdate(),
+ effectBehavior.getAfterFinish());
+ }
+
+ public static boolean isAnyPropertySet(Object... values)
+ {
+ for (Object value : values)
+ {
+ if (value != null)
+ {
+ return true;
+ }
+ }
+ return false;
+ }
}
Added: myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/JsEffectCallbackTarget.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/JsEffectCallbackTarget.java?rev=1130174&view=auto
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/JsEffectCallbackTarget.java (added)
+++ myfaces/tomahawk/trunk/sandbox/core20/src/main/java/org/apache/myfaces/custom/effect/JsEffectCallbackTarget.java Wed Jun 1 15:00:55 2011
@@ -0,0 +1,68 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.myfaces.custom.effect;
+
+import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
+
+/**
+ * Provide common properties for handle javascript effects callbacks
+ *
+ * @author Leonardo Uribe
+ *
+ */
+public interface JsEffectCallbackTarget
+{
+ /**
+ * Javascript function callback called before the effects rendering loop is started, or as soon as it is added to a queue.
+ */
+ @JSFProperty
+ public abstract String getBeforeStart();
+
+ /**
+ * Javascript function callback called before the effect is setup.
+ */
+ @JSFProperty
+ public abstract String getBeforeSetup();
+
+ /**
+ * Javascript function callback called after the effect is setup and immediately before the main effects rendering loop is started.
+ */
+ @JSFProperty
+ public abstract String getAfterSetup();
+
+ /**
+ * Javascript function callback called on each iteration of the effects rendering loop, before the redraw takes place.
+ */
+ @JSFProperty
+ public abstract String getBeforeUpdate();
+
+ /**
+ * Javascript function callback called on each iteration of the effects rendering loop, after the redraw takes place.
+ */
+ @JSFProperty
+ public abstract String getAfterUpdate();
+
+ /**
+ * Javascript function callback called on each iteration of the effects rendering loop, after the redraw takes place.
+ *
+ */
+ @JSFProperty
+ public abstract String getAfterFinish();
+
+}