You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by al...@apache.org on 2011/01/10 00:32:08 UTC
svn commit: r1057057 - in
/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5:
component/effect/ handler/ renderkit/animation/ renderkit/effect/
renderkit/util/
Author: aliok
Date: Sun Jan 9 23:32:07 2011
New Revision: 1057057
URL: http://svn.apache.org/viewvc?rev=1057057&view=rev
Log:
Html5
Simplified effect behaviors.
Added:
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffect.java
- copied, changed from r1056584, myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectScale.java
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectTransform.java
- copied, changed from r1056584, myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectScale.java
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectRenderer.java
- copied, changed from r1056584, myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectScaleRenderer.java
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectTransformRenderer.java
- copied, changed from r1056584, myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectScaleRenderer.java
Removed:
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectScale.java
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectScaleRenderer.java
Modified:
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/handler/EffectsHandler.java
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/animation/AnimationShakeRenderer.java
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectsRenderer.java
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/util/CSS.java
myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/util/Html5RendererUtils.java
Copied: myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffect.java (from r1056584, myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectScale.java)
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffect.java?p2=myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffect.java&p1=myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectScale.java&r1=1056584&r2=1057057&rev=1057057&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectScale.java (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffect.java Sun Jan 9 23:32:07 2011
@@ -23,15 +23,18 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
@JSFComponent(
- name = "fx:effectScale",
- clazz = "org.apache.myfaces.html5.component.effect.EffectScale",
- tagClass = "org.apache.myfaces.html5.tag.effect.EffectScaleTag",
- defaultRendererType = "org.apache.myfaces.html5.EffectScale",
- family = "org.apache.myfaces.EffectScale",
- type = "org.apache.myfaces.html5.EffectScale"
+ name = "fx:effect",
+ clazz = "org.apache.myfaces.html5.component.effect.Effect",
+ tagClass = "org.apache.myfaces.html5.tag.effect.EffectTag",
+ defaultRendererType = "org.apache.myfaces.html5.Effect",
+ family = "org.apache.myfaces.Effect",
+ type = "org.apache.myfaces.html5.Effect"
)
-public abstract class AbstractEffectScale extends org.apache.myfaces.html5.component.effect.BaseEffect{
+public abstract class AbstractEffect extends BaseEffect{
- @JSFProperty(deferredValueType = "java.lang.Double", required = true)
- public abstract double getSize();
+ @JSFProperty(deferredValueType = "java.lang.String", required = true)
+ public abstract String getProperty();
+
+ @JSFProperty(deferredValueType = "java.lang.String", required = true)
+ public abstract String getValue();
}
Copied: myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectTransform.java (from r1056584, myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectScale.java)
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectTransform.java?p2=myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectTransform.java&p1=myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectScale.java&r1=1056584&r2=1057057&rev=1057057&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectScale.java (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/component/effect/AbstractEffectTransform.java Sun Jan 9 23:32:07 2011
@@ -23,15 +23,66 @@ import org.apache.myfaces.buildtools.mav
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFProperty;
@JSFComponent(
- name = "fx:effectScale",
- clazz = "org.apache.myfaces.html5.component.effect.EffectScale",
- tagClass = "org.apache.myfaces.html5.tag.effect.EffectScaleTag",
- defaultRendererType = "org.apache.myfaces.html5.EffectScale",
- family = "org.apache.myfaces.EffectScale",
- type = "org.apache.myfaces.html5.EffectScale"
+ name = "fx:effectTransform",
+ clazz = "org.apache.myfaces.html5.component.effect.EffectTransform",
+ tagClass = "org.apache.myfaces.html5.tag.effect.EffectTransformTag",
+ defaultRendererType = "org.apache.myfaces.html5.EffectTransform",
+ family = "org.apache.myfaces.EffectTransform",
+ type = "org.apache.myfaces.html5.EffectTransform"
)
-public abstract class AbstractEffectScale extends org.apache.myfaces.html5.component.effect.BaseEffect{
+public abstract class AbstractEffectTransform extends org.apache.myfaces.html5.component.effect.BaseEffect{
- @JSFProperty(deferredValueType = "java.lang.Double", required = true)
- public abstract double getSize();
+ /**
+ *
+ * Can be : <br/>
+ * <ul>
+ * <li>deg: degrees</li>
+ * <li>grad: grads</li>
+ * <li>rad: radians</li>
+ * <li>turn: turns</li>
+ * </ul>
+ * @see <a href="http://www.w3.org/TR/css3-values/#angles">http://www.w3.org/TR/css3-values/#angles</a>
+ */
+ @JSFProperty(deferredValueType = "java.lang.String", required = false)
+ public abstract String getRotate();
+
+ @JSFProperty(deferredValueType = "java.lang.Double", required = false)
+ public abstract Double getScaleX();
+
+ @JSFProperty(deferredValueType = "java.lang.Double", required = false)
+ public abstract Double getScaleY();
+
+ /**
+ *
+ * Can be : <br/>
+ * <ul>
+ * <li>deg: degrees</li>
+ * <li>grad: grads</li>
+ * <li>rad: radians</li>
+ * <li>turn: turns</li>
+ * </ul>
+ * @see <a href="http://www.w3.org/TR/css3-values/#angles">http://www.w3.org/TR/css3-values/#angles</a>
+ */
+ @JSFProperty(deferredValueType = "java.lang.String", required = false)
+ public abstract String getSkewX();
+
+ /**
+ *
+ * Can be : <br/>
+ * <ul>
+ * <li>deg: degrees</li>
+ * <li>grad: grads</li>
+ * <li>rad: radians</li>
+ * <li>turn: turns</li>
+ * </ul>
+ * @see <a href="http://www.w3.org/TR/css3-values/#angles">http://www.w3.org/TR/css3-values/#angles</a>
+ */
+ @JSFProperty(deferredValueType = "java.lang.String", required = false)
+ public abstract String getSkewY();
+
+ @JSFProperty(deferredValueType = "java.lang.Double", required = false)
+ public abstract Double getTranslateX();
+
+ @JSFProperty(deferredValueType = "java.lang.Double", required = false)
+ public abstract Double getTranslateY();
}
Modified: myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/handler/EffectsHandler.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/handler/EffectsHandler.java?rev=1057057&r1=1057056&r2=1057057&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/handler/EffectsHandler.java (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/handler/EffectsHandler.java Sun Jan 9 23:32:07 2011
@@ -65,7 +65,11 @@ public class EffectsHandler extends java
EffectsActivationBehavior activationBehavior = (EffectsActivationBehavior) app.createBehavior(EffectsActivationBehavior.ID);
- activationBehavior.setEffectIdToHandle(component.getClientId(faceletContext.getFacesContext()));
+ String effectsIdToHandle = component.getClientId(faceletContext.getFacesContext());
+ if(!StringUtils.isBlank(component.getAdditionalStyleClassToActivate()))
+ effectsIdToHandle = effectsIdToHandle + " " + component.getAdditionalStyleClassToActivate();
+
+ activationBehavior.setEffectIdToHandle(effectsIdToHandle);
String eventName = getEventName(faceletContext);
if(StringUtils.isBlank(eventName))
@@ -76,7 +80,7 @@ public class EffectsHandler extends java
if(!StringUtils.isBlank(eventName) || deactivationEvents!=null){
EffectsDeactivationBehavior deactivationBehavior = (EffectsDeactivationBehavior) app.createBehavior(EffectsDeactivationBehavior.ID);
- deactivationBehavior.setEffectIdToHandle(component.getClientId(faceletContext.getFacesContext()));
+ deactivationBehavior.setEffectIdToHandle(effectsIdToHandle);
String[] deactivationEventNames = getDeactivationEventNames(faceletContext);
if(deactivationEventNames!=null){
Modified: myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/animation/AnimationShakeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/animation/AnimationShakeRenderer.java?rev=1057057&r1=1057056&r2=1057057&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/animation/AnimationShakeRenderer.java (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/animation/AnimationShakeRenderer.java Sun Jan 9 23:32:07 2011
@@ -40,7 +40,7 @@ public class AnimationShakeRenderer exte
final double rotation = component.getRotation(); //default value set, if not defined
- String format = "0%% { -webkit-transform: rotate(0deg)} 25%% { -webkit-transform: rotate(%sdeg)} 75%% { -webkit-transform: rotate(-%sdeg)} 100%% { -webkit-transform: rotate(0deg)}";
+ String format = "25%% { -webkit-transform: rotate(%sdeg)} 75%% { -webkit-transform: rotate(-%sdeg)}";
final NumberFormat numberFormat = NumberFormat.getInstance(Locale.ENGLISH);
Copied: myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectRenderer.java (from r1056584, myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectScaleRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectRenderer.java?p2=myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectRenderer.java&p1=myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectScaleRenderer.java&r1=1056584&r2=1057057&rev=1057057&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectScaleRenderer.java (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectRenderer.java Sun Jan 9 23:32:07 2011
@@ -21,30 +21,25 @@ package org.apache.myfaces.html5.renderk
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.html5.component.effect.AbstractBaseEffect;
-import org.apache.myfaces.html5.component.effect.AbstractEffectScale;
+import org.apache.myfaces.html5.component.effect.AbstractEffect;
import org.apache.myfaces.shared_html5.renderkit.RendererUtils;
import javax.faces.context.FacesContext;
-import java.text.NumberFormat;
-import java.util.Locale;
-@JSFRenderer(renderKitId = "HTML_BASIC", family = "org.apache.myfaces.EffectScale", type = "org.apache.myfaces.html5.EffectScale")
-public class EffectScaleRenderer extends BaseEffectRenderer {
+@JSFRenderer(renderKitId = "HTML_BASIC", family = "org.apache.myfaces.Effect", type = "org.apache.myfaces.html5.Effect")
+public class EffectRenderer extends BaseEffectRenderer {
@Override
protected String getEffectDefinition(FacesContext facesContext, AbstractBaseEffect uiComponent) {
- RendererUtils.checkParamValidity(facesContext, uiComponent, AbstractEffectScale.class);
+ RendererUtils.checkParamValidity(facesContext, uiComponent, AbstractEffect.class);
- AbstractEffectScale component = (AbstractEffectScale) uiComponent;
+ AbstractEffect component = (AbstractEffect) uiComponent;
- final double size = component.getSize();
+ final String property = component.getProperty();
+ final String value = component.getValue();
- String format = "scale(%s)";
+ String format = "%s : %s; ";
- final NumberFormat numberFormat = NumberFormat.getInstance(Locale.ENGLISH);
-
- final String strSize = numberFormat.format(size);
-
- return String.format(format,strSize);
+ return String.format(format, property, value);
}
}
\ No newline at end of file
Copied: myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectTransformRenderer.java (from r1056584, myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectScaleRenderer.java)
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectTransformRenderer.java?p2=myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectTransformRenderer.java&p1=myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectScaleRenderer.java&r1=1056584&r2=1057057&rev=1057057&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectScaleRenderer.java (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectTransformRenderer.java Sun Jan 9 23:32:07 2011
@@ -19,32 +19,77 @@
package org.apache.myfaces.html5.renderkit.effect;
+import org.apache.commons.lang.StringUtils;
import org.apache.myfaces.buildtools.maven2.plugin.builder.annotation.JSFRenderer;
import org.apache.myfaces.html5.component.effect.AbstractBaseEffect;
-import org.apache.myfaces.html5.component.effect.AbstractEffectScale;
+import org.apache.myfaces.html5.component.effect.AbstractEffectTransform;
+import org.apache.myfaces.html5.renderkit.util.CSS;
import org.apache.myfaces.shared_html5.renderkit.RendererUtils;
import javax.faces.context.FacesContext;
import java.text.NumberFormat;
import java.util.Locale;
-@JSFRenderer(renderKitId = "HTML_BASIC", family = "org.apache.myfaces.EffectScale", type = "org.apache.myfaces.html5.EffectScale")
-public class EffectScaleRenderer extends BaseEffectRenderer {
+@JSFRenderer(renderKitId = "HTML_BASIC", family = "org.apache.myfaces.EffectTransform", type = "org.apache.myfaces.html5.EffectTransform")
+public class EffectTransformRenderer extends BaseEffectRenderer {
@Override
protected String getEffectDefinition(FacesContext facesContext, AbstractBaseEffect uiComponent) {
- RendererUtils.checkParamValidity(facesContext, uiComponent, AbstractEffectScale.class);
+ RendererUtils.checkParamValidity(facesContext, uiComponent, AbstractEffectTransform.class);
- AbstractEffectScale component = (AbstractEffectScale) uiComponent;
+ AbstractEffectTransform component = (AbstractEffectTransform) uiComponent;
- final double size = component.getSize();
+ final NumberFormat numberFormat = NumberFormat.getInstance(Locale.ENGLISH);
- String format = "scale(%s)";
+ final String rotate = component.getRotate();
+ final String scaleX = _formatSafe(component.getScaleX(), numberFormat);
+ final String scaleY = _formatSafe(component.getScaleY(), numberFormat);
+ final String skewX = component.getSkewX();
+ final String skewY = component.getSkewY();
+ String translateX = _formatSafe(component.getTranslateX(), numberFormat);
+ String translateY = _formatSafe(component.getTranslateY(), numberFormat);
+
+ if(!StringUtils.isBlank(translateX))
+ translateX = translateX + "px";
+ if(!StringUtils.isBlank(translateY))
+ translateY = translateY + "px";
+
+ StringBuilder builder = new StringBuilder();
+ boolean appendedAtLeastOne;
+
+ appendedAtLeastOne = _appendSafe(CSS.TRANSFORMATION_FUNCTION_ROTATE, rotate, builder);
+ appendedAtLeastOne = appendedAtLeastOne | _appendSafe(CSS.TRANSFORMATION_FUNCTION_SCALE_X, scaleX, builder);
+ appendedAtLeastOne = appendedAtLeastOne | _appendSafe(CSS.TRANSFORMATION_FUNCTION_SCALE_Y, scaleY, builder);
+ appendedAtLeastOne = appendedAtLeastOne | _appendSafe(CSS.TRANSFORMATION_FUNCTION_SKEW_X, skewX, builder);
+ appendedAtLeastOne = appendedAtLeastOne | _appendSafe(CSS.TRANSFORMATION_FUNCTION_SKEW_Y, skewY, builder);
+ appendedAtLeastOne = appendedAtLeastOne | _appendSafe(CSS.TRANSFORMATION_FUNCTION_TRANSLATE_X, translateX, builder);
+ appendedAtLeastOne = appendedAtLeastOne | _appendSafe(CSS.TRANSFORMATION_FUNCTION_TRANSLATE_Y, translateY, builder);
+
+ if(!appendedAtLeastOne)
+ return "";
- final NumberFormat numberFormat = NumberFormat.getInstance(Locale.ENGLISH);
- final String strSize = numberFormat.format(size);
+ builder.insert(0, "-webkit-transform : ");
+ builder.append(";");
+
+ return builder.toString();
+ }
+
+ private boolean _appendSafe(String transformationFunction, String value, StringBuilder builder) {
+ if(StringUtils.isBlank(value))
+ return false;
+ else{
+ builder.append(" ").append(transformationFunction).append("(").append(value).append(")");
+ return true;
+ }
+
+
+ }
- return String.format(format,strSize);
+ private String _formatSafe(Double value, NumberFormat numberFormat) {
+ if(value==null)
+ return null;
+ else
+ return numberFormat.format(value);
}
}
\ No newline at end of file
Modified: myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectsRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectsRenderer.java?rev=1057057&r1=1057056&r2=1057057&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectsRenderer.java (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/effect/EffectsRenderer.java Sun Jan 9 23:32:07 2011
@@ -73,14 +73,13 @@ public class EffectsRenderer extends Htm
final String id = component.getClientId(facesContext);
writer.writeAttribute(HTML5.ID_ATTR, id, null);
- //TODO: what happens if id has colon? Will CSS accept it?
//write key frames (let child components render themselves)
- writer.writeText("." + Html5RendererUtils.escapeCssSelector(id) + " { -webkit-transform: ", component, null);
+ writer.writeText("." + Html5RendererUtils.escapeCssSelector(id) + " { ", component, null);
//TODO: allow only BaseEffect children!
super.encodeChildren(facesContext, component);
- writer.writeText(" ; } ", component, null);
+ writer.writeText(" } ", component, null);
//write CSS class definition with animation definition
writer.writeText(getTransitionDefinition(component),component, null);
}
Modified: myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/util/CSS.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/util/CSS.java?rev=1057057&r1=1057056&r2=1057057&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/util/CSS.java (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/util/CSS.java Sun Jan 9 23:32:07 2011
@@ -32,4 +32,12 @@ public interface CSS {
String TRANSITION_DURATION_PROP = "-webkit-transition-duration";
String TRANSITION_TIMING_FUNCTION_PROP = "-webkit-transition-timing-function";
String TRANSITION_DELAY_PROP = "-webkit-transition-delay";
+
+ String TRANSFORMATION_FUNCTION_ROTATE = "rotate";
+ String TRANSFORMATION_FUNCTION_SCALE_X = "scaleX";
+ String TRANSFORMATION_FUNCTION_SCALE_Y = "scaleY";
+ String TRANSFORMATION_FUNCTION_SKEW_X = "skewX";
+ String TRANSFORMATION_FUNCTION_SKEW_Y = "skewY";
+ String TRANSFORMATION_FUNCTION_TRANSLATE_X = "translateX";
+ String TRANSFORMATION_FUNCTION_TRANSLATE_Y = "translateY";
}
Modified: myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/util/Html5RendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/util/Html5RendererUtils.java?rev=1057057&r1=1057056&r2=1057057&view=diff
==============================================================================
--- myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/util/Html5RendererUtils.java (original)
+++ myfaces/gsoc/html5-comp-lib/trunk/html5-comp-lib-core/src/main/java/org/apache/myfaces/html5/renderkit/util/Html5RendererUtils.java Sun Jan 9 23:32:07 2011
@@ -248,6 +248,10 @@ public class Html5RendererUtils
return HtmlRendererUtils.findUIOutputConverterFailSafe(facesContext, component);
}
+ /**
+ * Escapes the given string for use as a CSS selector.
+ * @return Escaped selector
+ */
public static String escapeCssSelector(String selector) {
if(selector==null)
return null;