JBoss Rich Faces SVN: r13456 - in trunk/test-applications/realworld2/web: src/main/java/org/richfaces/realworld/util and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-09 07:41:03 -0400 (Thu, 09 Apr 2009)
New Revision: 13456
Added:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ActionMapperTagHandler.java
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/img/shell/button_press.png
trunk/test-applications/realworld2/web/src/main/webapp/scripts/buttons.js
Modified:
trunk/test-applications/realworld2/web/pom.xml
trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml
trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css
Log:
richx:commandButton made Facelets tag
Modified: trunk/test-applications/realworld2/web/pom.xml
===================================================================
--- trunk/test-applications/realworld2/web/pom.xml 2009-04-09 11:11:52 UTC (rev 13455)
+++ trunk/test-applications/realworld2/web/pom.xml 2009-04-09 11:41:03 UTC (rev 13456)
@@ -12,6 +12,12 @@
<packaging>war</packaging>
<dependencies>
<dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.drewnoakes</groupId>
<artifactId>metadata-extractor</artifactId>
<version>2.4.0-beta1</version>
Added: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ActionMapperTagHandler.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ActionMapperTagHandler.java (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/util/ActionMapperTagHandler.java 2009-04-09 11:41:03 UTC (rev 13456)
@@ -0,0 +1,201 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2006 - original idea by Andrew Robinson
+ * http://andrewfacelets.blogspot.com/2006/06/creating-composite-controls-wi...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.realworld.util;
+
+import java.io.IOException;
+
+import javax.el.ELContext;
+import javax.el.ELException;
+import javax.el.ExpressionFactory;
+import javax.el.MethodExpression;
+import javax.el.MethodInfo;
+import javax.el.ValueExpression;
+import javax.el.VariableMapper;
+import javax.faces.FacesException;
+import javax.faces.component.UIComponent;
+import javax.faces.event.ActionEvent;
+
+import com.sun.facelets.FaceletContext;
+import com.sun.facelets.FaceletException;
+import com.sun.facelets.el.VariableMapperWrapper;
+import com.sun.facelets.tag.TagConfig;
+import com.sun.facelets.tag.TagHandler;
+
+public class ActionMapperTagHandler extends TagHandler {
+
+ private static final Class<?>[] ACTION_PARAM_TYPES = new Class[0];
+
+ private static final Class<?>[] ACTION_LISTENER_PARAM_TYPES = new Class[] {ActionEvent.class};
+
+ private static final MethodInfo NOOP_ACTION_INFO = new MethodInfo("$$$noOpAction", String.class, ACTION_PARAM_TYPES);
+
+ private static final MethodExpression NOOP_ACTION_EXPRESSION = new MethodExpression() {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 8901807727474303033L;
+
+
+ @Override
+ public MethodInfo getMethodInfo(ELContext context) {
+ return NOOP_ACTION_INFO;
+ }
+
+ @Override
+ public Object invoke(ELContext context, Object[] params) {
+ return null;
+ }
+
+ @Override
+ public String getExpressionString() {
+ return "#{" + NOOP_ACTION_INFO.getName() + "}";
+ }
+
+ @Override
+ public boolean isLiteralText() {
+ return false;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return this == obj;
+ }
+
+ @Override
+ public int hashCode() {
+ return NOOP_ACTION_INFO.hashCode();
+ }
+
+ };
+
+ private static final MethodInfo NOOP_ACTION_LISTENER_INFO = new MethodInfo("$$$noOpActionListener", Void.class, ACTION_LISTENER_PARAM_TYPES);
+
+ private static final MethodExpression NOOP_ACTION_LISTENER_EXPRESSION = new MethodExpression() {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 6246200728401095532L;
+
+ @Override
+ public MethodInfo getMethodInfo(ELContext context) {
+ return NOOP_ACTION_LISTENER_INFO;
+ }
+
+ @Override
+ public Object invoke(ELContext context, Object[] params) {
+ return null;
+ }
+
+ @Override
+ public String getExpressionString() {
+ return "#{" + NOOP_ACTION_LISTENER_INFO.getName() + "}";
+ }
+
+ @Override
+ public boolean isLiteralText() {
+ return false;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ return this == obj;
+ }
+
+ @Override
+ public int hashCode() {
+ return NOOP_ACTION_LISTENER_INFO.hashCode();
+ }
+ };
+
+ private static final String ACTION = "action";
+
+ private static final String ACTION_LISTENER = "actionListener";
+
+ private static final String MAPPED_ACTION = "mappedAction";
+
+ private static final String MAPPED_ACTION_LISTENER = "mappedActionListener";
+
+ public ActionMapperTagHandler(TagConfig config) {
+ super(config);
+ }
+
+ private MethodExpression remap(FaceletContext faceletContext, String varName,
+ Class<?> expectedReturnType, Class<?>[] expectedParamTypes) {
+
+ MethodExpression result = null;
+
+ VariableMapper mapper = faceletContext.getVariableMapper();
+ ValueExpression valueExpression = mapper.resolveVariable(varName);
+ if (valueExpression != null) {
+ ExpressionFactory ef = faceletContext.getExpressionFactory();
+ ELContext elContext = faceletContext.getFacesContext().getELContext();
+
+ result = ef.createMethodExpression(elContext, valueExpression.getExpressionString(),
+ expectedReturnType, expectedParamTypes);
+ }
+
+ return result;
+ }
+
+ public void apply(FaceletContext ctx, UIComponent parent)
+ throws IOException, FacesException, FaceletException, ELException {
+
+ MethodExpression actionExpression = remap(ctx, ACTION, String.class, ACTION_PARAM_TYPES);
+ MethodExpression actionListenerExpression = remap(ctx, ACTION_LISTENER, null, ACTION_LISTENER_PARAM_TYPES);
+
+ if (actionExpression != null || actionListenerExpression != null) {
+ VariableMapper initialVarMapper = ctx.getVariableMapper();
+ try {
+ VariableMapperWrapper varMapper = new VariableMapperWrapper(initialVarMapper);
+
+ if (actionExpression == null) {
+ actionExpression = NOOP_ACTION_EXPRESSION;
+ }
+
+ varMapper.setVariable(MAPPED_ACTION,
+ ctx.getExpressionFactory().createValueExpression(actionExpression,
+ MethodExpression.class));
+
+ if (actionListenerExpression == null) {
+ actionListenerExpression = NOOP_ACTION_LISTENER_EXPRESSION;
+ }
+
+ varMapper.setVariable(MAPPED_ACTION_LISTENER,
+ ctx.getExpressionFactory().createValueExpression(actionListenerExpression,
+ MethodExpression.class));
+
+ ctx.setVariableMapper(varMapper);
+
+ nextHandler.apply(ctx, parent);
+
+ } finally {
+ ctx.setVariableMapper(initialVarMapper);
+ }
+ } else {
+ nextHandler.apply(ctx, parent);
+ }
+ }
+
+}
Modified: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-04-09 11:11:52 UTC (rev 13455)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-04-09 11:41:03 UTC (rev 13456)
@@ -6,9 +6,10 @@
<namespace>http://richfaces.org/richx</namespace>
<tag>
<tag-name>commandButton</tag-name>
- <component>
- <component-type>org.ajax4jsf.CommandButton</component-type>
- <renderer-type>org.ajax4jsf.components.RealworldAjaxCommandButtonRenderer</renderer-type>
- </component>
+ <source>templates/button.xhtml</source>
</tag>
+ <tag>
+ <tag-name>actionMapper</tag-name>
+ <handler-class>org.richfaces.realworld.util.ActionMapperTagHandler</handler-class>
+ </tag>
</facelet-taglib>
\ No newline at end of file
Added: trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/WEB-INF/tags/templates/button.xhtml 2009-04-09 11:41:03 UTC (rev 13456)
@@ -0,0 +1,36 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:s="http://jboss.com/products/seam/taglib"
+ xmlns:c="http://java.sun.com/jstl/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:richx="http://richfaces.org/richx">
+
+ <a4j:loadScript src="/scripts/buttons.js" />
+
+ <richx:actionMapper>
+ <a4j:outputPanel id="#{myid}" layout="block" style="#{style}" styleClass="realworldButton #{styleClass}" lang="#{lang}" dir="#{dir}" title="#{title}"
+ rendered="#{empty rendered or rendered}"
+ onmousedown="RF_RW_DEMO.toPressed(this)" onmouseup="RF_RW_DEMO.toReleased(this)" onmouseout="RF_RW_DEMO.toReleased(this)">
+
+ <h:graphicImage value="/img/shell/button.png" alt="" />
+ <h:graphicImage value="/img/shell/button_press.png" style="display: none;" alt="" />
+
+ <div>#{value}</div>
+
+ <a4j:commandButton accesskey="#{accesskey}" ajaxSingle="#{ajaxSingle}" alt="#{alt}" type="image" image="/img/shell/spacer.gif"
+ actionListener="#{mappedActionListener}" action="#{mappedAction}" bypassUpdates="#{bypassUpdates}" data="#{data}" disabled="#{disabled}"
+ eventsQueue="#{eventsQueue}" focus="#{focus}" ignoreDupResponses="#{ignoreDupResponses}" immediate="#{immediate}" limitToList="#{limitToList}"
+ onbeforedomupdate="#{onbeforedomupdate}" timeout="#{timeout}" tabindex="#{tabindex}" status="#{status}" similarityGroupingId="#{similarityGroupingId}"
+ reRender="#{reRender}" requestDelay="#{requestDelay}" process="#{process}" oncomplete="#{oncomplete}"
+ onblur="#{onblur}" onclick="#{onclick}" ondblclick="#{ondblclick}" onfocus="#{onfocus}" onkeydown="#{onkeydown}" onkeypress="#{onkeypress}" onkeyup="#{onkeyup}"
+ onmousedown="#{onmousedown}" onmousemove="#{onmousemove}" onmouseout="#{onmouseout}" onmouseover="#{onmouseover}" onmouseup="#{onmouseup}" />
+
+ </a4j:outputPanel>
+ </richx:actionMapper>
+
+</ui:composition>
\ No newline at end of file
Added: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/button_press.png
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld2/web/src/main/webapp/img/shell/button_press.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/realworld2/web/src/main/webapp/scripts/buttons.js
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/scripts/buttons.js (rev 0)
+++ trunk/test-applications/realworld2/web/src/main/webapp/scripts/buttons.js 2009-04-09 11:41:03 UTC (rev 13456)
@@ -0,0 +1,21 @@
+if (!window.RF_RW_DEMO) {
+ window.RF_RW_DEMO = {};
+}
+
+(function(demo) {
+ var findButtons = function(elt) {
+ return $(elt).select('img');
+ };
+
+ demo.toPressed = function(elt) {
+ var buttons = findButtons(elt);
+ buttons[1].show();
+ buttons[0].hide();
+ };
+
+ demo.toReleased = function(elt) {
+ var buttons = findButtons(elt);
+ buttons[0].show();
+ buttons[1].hide();
+ };
+}(RF_RW_DEMO));
Modified: trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css 2009-04-09 11:11:52 UTC (rev 13455)
+++ trunk/test-applications/realworld2/web/src/main/webapp/stylesheet/realworld.css 2009-04-09 11:41:03 UTC (rev 13456)
@@ -814,28 +814,40 @@
text-decoration:none;
}
+
.realworldButton {
- margin : 0px 0px 0px 0px;
- position : relative;
- width : 103px;
- height : 28px;
+ margin: 0px 0px 0px 0px;
+ position: relative;
+ width: 103px;
+ height: 28px;
cursor: pointer;
}
-.realworldButton div {
- position : absolute;
- color : #ffffff;
- top : 7px;
- left : 11px;
- font-weight : bold;
+.realworldButton input, .realworldButton img {
+ position: absolute;
+ top: 0px;
+ left: 0px;
+ width: 103px;
+ height: 28px;
}
.realworldButton img {
- position : absolute;
- top : 0px;
- left : 0px;
+ border-width: 0px;
}
+.realworldButton input {
+ outline-style: none;
+}
+
+.realworldButton div {
+ position: absolute;
+ color: #ffffff;
+ top: 7px;
+ left: 0px;
+ width: 103px;
+ text-align: center;
+}
+
.album-edit-field {
padding-top : 8px
}
15 years, 5 months
JBoss Rich Faces SVN: r13455 - in trunk/test-applications/realworld2/web/src/main/webapp/includes: index and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-04-09 07:11:52 -0400 (Thu, 09 Apr 2009)
New Revision: 13455
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/index/login.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/confirmation.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/help.xhtml
trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/createShelf.xhtml
Log:
add appear effect for ModalPanels
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/album/createAlbum.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/index/login.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/confirmation.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/misc/help.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/realworld2/web/src/main/webapp/includes/shelf/createShelf.xhtml
===================================================================
(Binary files differ)
15 years, 5 months
JBoss Rich Faces SVN: r13454 - trunk/test-applications/realworld2/web/src/main/webapp/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-04-09 07:11:11 -0400 (Thu, 09 Apr 2009)
New Revision: 13454
Modified:
trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js
Log:
add effect applying function
Modified: trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js
===================================================================
--- trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js 2009-04-09 10:16:19 UTC (rev 13453)
+++ trunk/test-applications/realworld2/web/src/main/webapp/scripts/realworld.js 2009-04-09 11:11:11 UTC (rev 13454)
@@ -5,4 +5,21 @@
target.value = value.length != 0 ? value + ", " + tag : tag;
}
}
+}
+
+function applyModalPanelEffect(panelId, effectFunc, params) {
+ if (panelId && effectFunc) {
+
+ var modalPanel = $(panelId);
+
+ if (modalPanel && modalPanel.component) {
+ var component = modalPanel.component;
+ var div = component.getSizedElement();
+
+ Element.hide(div);
+
+ effectFunc.call(this, Object.extend({targetId: div.id}, params || {}));
+ }
+
+ }
}
\ No newline at end of file
15 years, 5 months
JBoss Rich Faces SVN: r13452 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-04-09 06:15:02 -0400 (Thu, 09 Apr 2009)
New Revision: 13452
Modified:
trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
Log:
https://jira.jboss.org/jira/browse/RF-6722 - adding two classes to the table: rich-mp-container, rich-mp-content-table;
Modified: trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2009-04-09 09:09:11 UTC (rev 13451)
+++ trunk/docs/userguide/en/src/main/docbook/included/modalPanel.xml 2009-04-09 10:15:02 UTC (rev 13452)
@@ -635,19 +635,25 @@
</row>
<row>
- <entry>rich-mpnl_panel</entry>
-
- <entry>Defines styles for a
- modalPanel</entry>
- </row>
-
- <row>
<entry>rich-mpnl-mask-div</entry>
<entry>Defines styles for a wrapper
<div> element of
a mask</entry>
</row>
+
+ <row>
+ <entry>rich-mpnl_panel</entry>
+
+ <entry>Defines styles for a
+ modalPanel</entry>
+ </row>
+
+ <row>
+ <entry>rich-mp-container </entry>
+
+ <entry>Defines styles for a modalPanel container</entry>
+ </row>
<row>
<entry>rich-mpnl-resizer</entry>
@@ -663,6 +669,12 @@
<entry>Defines styles for a modalPanel
shadow</entry>
</row>
+
+ <row>
+ <entry>rich-mp-content-table</entry>
+
+ <entry>Defines styles for a <table> element of a modalPanel</entry>
+ </row>
<row>
<entry>rich-mpnl-header</entry>
15 years, 5 months
JBoss Rich Faces SVN: r13451 - trunk/framework/impl/src/main/resources/META-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-09 05:09:11 -0400 (Thu, 09 Apr 2009)
New Revision: 13451
Modified:
trunk/framework/impl/src/main/resources/META-INF/resources-config.xml
Log:
Added jquery.utils.js to resources-config.xml
Modified: trunk/framework/impl/src/main/resources/META-INF/resources-config.xml
===================================================================
--- trunk/framework/impl/src/main/resources/META-INF/resources-config.xml 2009-04-09 08:38:53 UTC (rev 13450)
+++ trunk/framework/impl/src/main/resources/META-INF/resources-config.xml 2009-04-09 09:09:11 UTC (rev 13451)
@@ -2,10 +2,10 @@
<resource-config>
<resource class="org.ajax4jsf.javascript.AjaxScript">
<name>org.ajax4jsf.javascript.AjaxScript</name>
- </resource>
- <resource class="org.ajax4jsf.javascript.SmartPositionScript">
- <name>org.ajax4jsf.javascript.SmartPositionScript</name>
</resource>
+ <resource class="org.ajax4jsf.javascript.SmartPositionScript">
+ <name>org.ajax4jsf.javascript.SmartPositionScript</name>
+ </resource>
<resource class="org.ajax4jsf.javascript.AjaxScript">
<name>ajax.js</name>
</resource>
@@ -25,24 +25,24 @@
<path>org/ajax4jsf/framework.pack.js</path>
<renderer class="org.ajax4jsf.resource.CompressedScriptRenderer"/>
</resource>
- <resource >
- <name>org/ajax4jsf/renderers/ajax/scripts/form.js</name>
- <path>/org/ajax4jsf/javascript/scripts/form.js</path>
- <renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
- </resource>
- <resource class="org.richfaces.renderkit.html.GradientA">
- <name>org.richfaces.renderkit.html.GradientA</name>
- </resource>
+ <resource >
+ <name>org/ajax4jsf/renderers/ajax/scripts/form.js</name>
+ <path>/org/ajax4jsf/javascript/scripts/form.js</path>
+ <renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
+ </resource>
+ <resource class="org.richfaces.renderkit.html.GradientA">
+ <name>org.richfaces.renderkit.html.GradientA</name>
+ </resource>
<resource class="org.richfaces.renderkit.html.CustomizeableGradient">
<name>org.richfaces.renderkit.html.CustomizeableGradient</name>
</resource>
- <resource class="org.richfaces.renderkit.html.images.SliderArrowImage">
- <name>org.richfaces.renderkit.html.images.SliderArrowImage</name>
- </resource>
+ <resource class="org.richfaces.renderkit.html.images.SliderArrowImage">
+ <name>org.richfaces.renderkit.html.images.SliderArrowImage</name>
+ </resource>
<resource class="org.richfaces.renderkit.html.BaseGradient">
<name>org.richfaces.renderkit.html.BaseGradient</name>
</resource>
-
+
<resource>
<name>jquery.js</name>
<path>org/richfaces/renderkit/html/scripts/jquery/jquery.js</path>
@@ -82,21 +82,27 @@
<name>scriptaculous/sound.js</name>
<path>org/richfaces/renderkit/html/scripts/scriptaculous/sound.js</path>
<renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
- </resource>
-
+ </resource>
+
<resource>
<name>scriptaculous/unittest.js</name>
<path>org/richfaces/renderkit/html/scripts/scriptaculous/unittest.js</path>
<renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
</resource>
-
+
<resource>
<name>org/richfaces/renderkit/html/scripts/jquery.jcarousel.js</name>
<path>org/richfaces/renderkit/html/scripts/jquery.jcarousel.js</path>
<renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
</resource>
-
+
<resource>
+ <name>org/richfaces/renderkit/html/scripts/jquery.utils.js</name>
+ <path>org/richfaces/renderkit/html/scripts/jquery.utils.js</path>
+ <renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
+ </resource>
+
+ <resource>
<name>org/ajax4jsf/javascript/scripts/AJAX.js</name>
<path>org/ajax4jsf/javascript/scripts/AJAX.js</path>
<renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
@@ -130,5 +136,5 @@
<name>org/richfaces/renderkit/html/scripts/skinning.js</name>
<path>org/richfaces/renderkit/html/scripts/skinning.js</path>
<renderer class="org.ajax4jsf.resource.ScriptRenderer"/>
- </resource>
+ </resource>
</resource-config>
15 years, 5 months
JBoss Rich Faces SVN: r13450 - trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-04-09 04:38:53 -0400 (Thu, 09 Apr 2009)
New Revision: 13450
Modified:
trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java
Log:
remove ImageIO classes
Modified: trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java
===================================================================
--- trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-09 08:27:28 UTC (rev 13449)
+++ trunk/test-applications/realworld2/web/src/main/java/org/richfaces/realworld/ui/ImageLoader.java 2009-04-09 08:38:53 UTC (rev 13450)
@@ -21,14 +21,11 @@
package org.richfaces.realworld.ui;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.io.Serializable;
-import javax.imageio.ImageIO;
-import javax.imageio.stream.ImageInputStream;
-import javax.imageio.stream.ImageOutputStream;
-
import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.AutoCreate;
import org.jboss.seam.annotations.In;
@@ -47,30 +44,31 @@
@In FileManager fileManager;
public void paintImage(OutputStream out, Object data) throws IOException {
- if (null == data) {
+
+ if (null == data) {
return;
}
+
File imageResource = null;
+
if(data.toString().endsWith(Constants.UPLOAD)){
imageResource = fileManager.getFileByAbsolutePath(data.toString());
}else{
imageResource = fileManager.getFileByPath(data.toString());
}
+
if (imageResource != null && imageResource.exists()) {
byte [] toWrite = new byte[Constants.DEFAULT_BUFFER_SIZE];
- ImageInputStream inputStream = ImageIO.createImageInputStream(imageResource);
- ImageOutputStream outputStream = ImageIO.createImageOutputStream(out);
+ FileInputStream in = new FileInputStream(imageResource);
try {
- while(inputStream.read(toWrite) != -1) {
- outputStream.write(toWrite);
- }
-
+ while(in.read(toWrite) != -1) {
+ out.write(toWrite);
+ }
} finally {
- outputStream.close();
- inputStream.close();
+ in.close();
}
}
15 years, 5 months
JBoss Rich Faces SVN: r13449 - trunk/ui/fileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2009-04-09 04:27:28 -0400 (Thu, 09 Apr 2009)
New Revision: 13449
Added:
trunk/ui/fileUpload/rf6473.patch
Log:
https://jira.jboss.org/jira/browse/RF-6473
patch
Added: trunk/ui/fileUpload/rf6473.patch
===================================================================
--- trunk/ui/fileUpload/rf6473.patch (rev 0)
+++ trunk/ui/fileUpload/rf6473.patch 2009-04-09 08:27:28 UTC (rev 13449)
@@ -0,0 +1,79 @@
+Index: src/main/flash/src/FileUploadComponent.as
+===================================================================
+--- src/main/flash/src/FileUploadComponent.as (revision 13448)
++++ src/main/flash/src/FileUploadComponent.as (working copy)
+@@ -22,6 +22,7 @@
+ private var uploadIndex: Number;
+ private var parent:MovieClip;
+ private var disabled:Boolean;
++ private var isIE:Boolean;
+
+ public function FileUploadComponent(parent:MovieClip) {
+ this.parent = parent;
+@@ -33,13 +34,18 @@
+ this.fileTypes = null;
+ this.uploadIndex = -1;
+ this.disabled = true;
+-
++ this.isIE = false;
++
++ this.addCallbacks();
++ }
++
++ private function addCallbacks() {
+ //ExternalInterface.addCallback("browse", this, browse);
+ ExternalInterface.addCallback("setProperties", this, setProperties);
+ ExternalInterface.addCallback("removeFile", this, removeFile);
+ ExternalInterface.addCallback("uploadFile", this, uploadFile);
+ ExternalInterface.addCallback("cancelUploadFile", this, cancelUploadFile);
+- ExternalInterface.addCallback("disableAdd", this, disableAdd);
++ ExternalInterface.addCallback("disableAdd", this, disableAdd);
+ }
+
+ public function setProperties(properties:Object)
+@@ -47,6 +53,7 @@
+ this.acceptedTypes = properties.acceptedTypes;
+ this.noDuplicate = properties.noDuplicate;
+ this.maxFiles = properties.maxFiles;
++ this.isIE = properties.isIE;
+ if (!this.acceptedTypes['*'])
+ {
+ var types:String = "";
+@@ -138,6 +145,9 @@
+ }
+
+ public function browse() {
++ if (this.isIE) {
++ this.addCallbacks();
++ }
+ var fileRef:FileReferenceList = new FileReferenceList();
+ fileRef.addListener(this);
+ //[{description: "Image files", extension: "*.jpg;*.gif;*.png", macType: "JPEG;jp2_;GIFf;PNGf"}, {description: "Flash Movies", extension: "*.swf", macType: "SWFL"}]
+Index: src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
+===================================================================
+--- src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js (revision 13448)
++++ src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js (working copy)
+@@ -1149,7 +1149,7 @@
+ var div = document.createElement('div');
+ div.innerHTML = '<a href="http'+httpsSuffix+'://www.adobe.com/go/getflashplayer"><img style="border:0px; margin:2px" src="http'+httpsSuffix+'://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash player" /></a>';
+ var oid = this.id+":flashContainer";
+- var object = document.getElementById(oid);
++ //var object = document.getElementById(oid);
+ this.isFlash = swfobject.hasFlashPlayerVersion("9.0.28");
+ if (this.isFlash)
+ {
+@@ -1181,11 +1181,12 @@
+
+ _flashSetComponent: function() {
+ var flashId = this.id+":flashContainer";
+- this.flashComponent = (document[flashId]) ? document[flashId] : (window[flashId] ? window[flashId] : $(flashId));
++ this.flashComponent = document[flashId] ? document[flashId] : (window[flashId] ? window[flashId]: $(flashId));
+ this.flashComponent.setProperties({
+ acceptedTypes: this.acceptedTypes,
+ noDuplicate: this.options.noDuplicate,
+- maxFiles: this.maxFileBatchSize });
++ maxFiles: this.maxFileBatchSize�,
++ isIE: Richfaces.browser.isIE});
+ if (Richfaces.browser.isIE)
+ {
+ this.flashComponent.style.width = this.currentInput.parentNode.style.width;
15 years, 5 months
JBoss Rich Faces SVN: r13448 - in trunk: samples/themes/src/main/templates/org/richfaces and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2009-04-08 20:26:42 -0400 (Wed, 08 Apr 2009)
New Revision: 13448
Modified:
trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss
trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx
trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java
Log:
Scinnable theme2
Modified: trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss
===================================================================
--- trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss 2009-04-08 23:32:52 UTC (rev 13447)
+++ trunk/samples/themes/src/main/resources/org/richfaces/renderkit/html/css/theme2.xcss 2009-04-09 00:26:42 UTC (rev 13448)
@@ -3,25 +3,75 @@
<f:template xmlns:f='http:/jsf.exadel.com/template'
xmlns:u='http:/jsf.exadel.com/template/util'
xmlns="http://www.w3.org/1999/xhtml">
+ <u:selector name="body">
+ <u:style name="background" skin="generalBackgroundColor"/>
+ <u:style name="margin" value="0px"/>
+ </u:selector>
+ <u:selector name=".header_bg">
+ <u:style name="background-image">
+ <!-- images/bg_header.png -->
+ <f:resource f:key="org.richfaces.renderkit.html.images.PageContentGradient"/>
+ </u:style>
+ <u:style name="border-bottom" value="1px solid" />
+ <u:style name="border-bottom-color" skin="generalBackgroundColor" />
+ <u:style name="background-color" skin="headerBackgroundColor"/>
+ <u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="background-position" value="top left"/>
+ </u:selector>
+
+ <u:selector name=".footer_bg">
+ <u:style name="background-image">
+ <!-- images/bg_footer.png -->
+ <f:resource f:key="org.richfaces.renderkit.html.images.PageContentGradient"/>
+ </u:style>
+ <u:style name="border-top" value="1px solid" />
+ <u:style name="border-top-color" skin="generalBackgroundColor" />
+ <u:style name="background-color" skin="panelBorderColor"/>
+ <u:style name="background-repeat" value="repeat-x"/>
+ <u:style name="background-position" value="top left"/>
+ </u:selector>
+
+ <u:selector name=".menu_col">
+ <u:style name="background" skin="generalBackgroundColor"/>
+ <u:style name="vertical-align" value="top"/>
+ <u:style name="border-top" value="2px solid" />
+ <u:style name="border-top-color" skin="panelBorderColor" />
+ <u:style name="border-right" value="2px solid" />
+ <u:style name="border-right-color" skin="panelBorderColor" />
+ <u:style name="border-bottom" value="2px solid" />
+ <u:style name="border-bottom-color" skin="panelBorderColor" />
+ </u:selector>
+
+ <u:selector name=".content_col">
+ <u:style name="background" skin="generalBackgroundColor"/>
+ <u:style name="vertical-align" value="top"/>
+ <u:style name="width" value="100%"/>
+ <u:style name="border-top" value="2px solid" />
+ <u:style name="border-top-color" skin="panelBorderColor" />
+ <u:style name="border-bottom" value="2px solid" />
+ <u:style name="border-bottom-color" skin="panelBorderColor" />
+ </u:selector>
+ <u:selector name="*.menu_col, *.content_col, *.footer_bg">
+ <u:style name="font-family" skin="generalFamilyFont" />
+ <u:style name="color" skin="generalTextColor" />
+ <u:style name="font-size" skin="generalSizeFont" />
+ </u:selector>
+ <u:selector name="*.header_content">
+ <u:style name="font-family" skin="headerFamilyFont" />
+ <u:style name="color" skin="headerTextColor" />
+ <u:style name="font-size" skin="headerSizeFont" />
+ </u:selector>
<f:verbatim>
<![CDATA[
.menu_width{width : 300px;}
-body {
- margin : 0px;
- background : #f1f1f1; /*generalBackgroundColor*/
-}
.page_size {
width : 100%;
height : 100%;
}
-.header_bg {
- background : url(images/bg_header.png) top left repeat-x #005000; /*headerBackgroundColor*/
- border-bottom : 1px solid #f1f1f1; /*generalBackgroundColor*/
-}
.header_content {
margin : 0px 0px 0px 0px;
@@ -30,41 +80,7 @@
.spacer{font-size : 1px;}
-.menu_col {
- border-right : 2px solid #C0C0C0; /*panelBorderColor*/
- border-top : 2px solid #C0C0C0; /*panelBorderColor*/
- border-bottom : 2px solid #C0C0C0; /*panelBorderColor*/
- vertical-align : top;
- background : #f1f1f1; /*generalBackgroundColor*/
-}
-.content_col {
- border-top : 2px solid #C0C0C0; /*panelBorderColor*/
- border-bottom : 2px solid #C0C0C0; /*panelBorderColor*/
- vertical-align : top;
- width : 100%;
- background : #f1f1f1; /*generalBackgroundColor*/
-}
-
-*.menu_col, *.content_col, *.footer_bg {
- color : #000000; /*generalTextColor*/
- font-size : 11px; /*generalSizeFont*/
- font-family : Arial, Verdana, sans-serif ; /*generalFamilyFont*/
-
-}
-
-*.header_content {
- color : #FFFFFF; /*headerTextColor*/
- font-size : 12px; /*headerSizeFont*/
- font-family : Arial, Verdana, sans-serif ; /*headerFamilyFont*/
-
-}
-
-.footer_bg {
- border-top : 1px solid #f1f1f1; /*generalBackgroundColor*/
- background : url(images/bg_footer.png) top left repeat-x #c0c0c0; /*panelBorderColor*/
-}
-
.footer_bg_content {
margin : 0px 0px 0px 0px;
height : 45px;
Modified: trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx
===================================================================
--- trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx 2009-04-08 23:32:52 UTC (rev 13447)
+++ trunk/samples/themes/src/main/templates/org/richfaces/theme2.jspx 2009-04-09 00:26:42 UTC (rev 13448)
@@ -19,11 +19,12 @@
<title>#{component.attributes['pageTitle']}</title>
<f:call name="themeStyle"/>
<f:call name="themeScript"/>
+ <f:call name="pageStyle"/>
<u:insertFacet name="pageHeader"/>
</head>
<body x:passThruWithExclusions="value,name,type,id">
- <table border="0" cellpadding="0" cellspacing="0" class="page_size">
+ <table border="0" cellpadding="0" cellspacing="0" class="rich-page">
<tr>
<td class="header_bg">
<div class="header_content">
@@ -38,7 +39,7 @@
<table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
<tr>
<td class="menu_col">
- <div class="menu_width spacer"></div>
+ <div class="menu_width spacer" style="width:#{component.attributes['sidebarWidth']}"></div>
<!-- begin menu -->
<u:insertFacet name="sidebar"/>
<!-- end meny -->
Modified: trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java
===================================================================
--- trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java 2009-04-08 23:32:52 UTC (rev 13447)
+++ trunk/ui/layout/src/main/java/org/richfaces/renderkit/AbstractLayoutRenderer.java 2009-04-09 00:26:42 UTC (rev 13448)
@@ -170,6 +170,6 @@
}
private boolean isEmpty(String leftWidth) {
- return null == leftWidth || leftWidth.length() >0;
+ return null == leftWidth || leftWidth.length() == 0;
}
}
15 years, 5 months
JBoss Rich Faces SVN: r13447 - trunk/ui/fileUpload/src/main/templates/org/richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-04-08 19:32:52 -0400 (Wed, 08 Apr 2009)
New Revision: 13447
Modified:
trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:
https://jira.jboss.org/jira/browse/RF-6727
Modified: trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2009-04-08 18:13:29 UTC (rev 13446)
+++ trunk/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx 2009-04-08 23:32:52 UTC (rev 13447)
@@ -63,7 +63,7 @@
</jsp:scriptlet>
-<div class="rich-fileupload-list-decor"
+<div class="rich-fileupload-list-decor #{component.attributes['styleClass']}"
onclick="#{component.attributes['onclick']}"
onmouseover="#{component.attributes['onmouseover']}"
ondblclick="#{component.attributes['ondblclick']}"
15 years, 5 months