JBoss Rich Faces SVN: r12063 - trunk/test-applications/jsp/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-12-30 06:08:48 -0500 (Tue, 30 Dec 2008)
New Revision: 12063
Modified:
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
Log:
Correct filter mapping for extension filter to check fileUpload.
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-12-30 11:06:08 UTC (rev 12062)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-12-30 11:08:48 UTC (rev 12063)
@@ -3,6 +3,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>vcp-ComponentsTesting_3_0(1.1)</display-name>
+
<context-param>
<param-name>org.ajax4jsf.SKIN</param-name>
<param-value>#{skinBean.skin}</param-value>
@@ -258,26 +259,18 @@
</filter>
<filter-mapping>
- <filter-name>extensionsFilter</filter-name>
- <servlet-name>Faces Servlet</servlet-name>
- </filter-mapping>
-
-
-
-
- <filter-mapping>
- <filter-name>extensionsFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
-
- <filter-mapping>
<filter-name>ajax4jsf</filter-name>
<servlet-name>Faces Servlet</servlet-name>
<dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
+
+ <filter-mapping>
+ <filter-name>extensionsFilter</filter-name>
+ <servlet-name>Faces Servlet</servlet-name>
+ </filter-mapping>
<session-config>
<session-timeout>600</session-timeout>
@@ -306,4 +299,10 @@
<login-config>
<auth-method>BASIC</auth-method>
</login-config>
+
+ <error-page>
+ <error-code>404</error-code>
+ <location>/error404.jsf</location>
+ </error-page>
+
</web-app>
15 years, 3 months
JBoss Rich Faces SVN: r12062 - trunk/test-applications/jsp/src/main/webapp/FileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-12-30 06:06:08 -0500 (Tue, 30 Dec 2008)
New Revision: 12062
Modified:
trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
Log:
Remove rich:function
Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-12-30 10:57:51 UTC (rev 12061)
+++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-12-30 11:06:08 UTC (rev 12062)
@@ -12,7 +12,7 @@
<rich:fileUpload id="fileUploadID" status="a4jStatusID"
allowFlash="#{fileUpload.allowFlash}"
immediate="#{fileUpload.immediate}"
- ajaxSingle="#{fileUpload.ajaxSingle}" uploadData="#{fileUpload.data}"
+ ajaxSingle="true" uploadData="#{fileUpload.data}"
acceptedTypes="#{fileUpload.acceptedTypes}"
disabled="#{fileUpload.disabled}" autoclear="#{fileUpload.autoclear}"
required="#{fileUpload.required}" requiredMessage="#{item.fileName}"
@@ -173,7 +173,7 @@
onmousedown="return $('formID:FileUploadSubviewID:fileUploadID').component.beforeSubmit()"
value="Submit"></h:commandButton>
</h:panelGrid>
- <br />
+ <br />
<f:verbatim>
<h:outputText value="Component controll" style="FONT-WEIGHT: bold;"></h:outputText>
<br />
@@ -193,16 +193,5 @@
<rich:componentControl attachTo="stopID" event="onclick"
for="fileUploadID" operation="stop"></rich:componentControl>
<rich:componentControl attachTo="clearID" event="onclick"
- for="fileUploadID" operation="clear"></rich:componentControl>
- <br />
- <br />
- <div style="FONT-WEIGHT: bold;">rich:findComponent</div>
- <h:panelGrid columns="2">
- <rich:column>
- <a4j:commandLink value="getFileName" reRender="findID"></a4j:commandLink>
- </rich:column>
- <rich:column id="findID">
- <h:outputText value="#{rich:findComponent('fileUploadID').uploadData[0].fileName}" />
- </rich:column>
- </h:panelGrid>
+ for="fileUploadID" operation="clear"></rich:componentControl>
</f:subview>
\ No newline at end of file
15 years, 3 months
JBoss Rich Faces SVN: r12061 - Plan and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-12-30 05:57:51 -0500 (Tue, 30 Dec 2008)
New Revision: 12061
Modified:
trunk/test-applications/qa/Test Plan/TestPlan-RF.doc
Log:
Correction of seam test application building.
Modified: trunk/test-applications/qa/Test Plan/TestPlan-RF.doc
===================================================================
(Binary files differ)
15 years, 3 months
JBoss Rich Faces SVN: r12060 - in trunk/test-applications/seamApp: web and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-12-30 05:54:41 -0500 (Tue, 30 Dec 2008)
New Revision: 12060
Modified:
trunk/test-applications/seamApp/pom.xml
trunk/test-applications/seamApp/web/pom.xml
Log:
Change maven key from richfacesVersion to rfVersion like in jsp & facelets applications.
Modified: trunk/test-applications/seamApp/pom.xml
===================================================================
--- trunk/test-applications/seamApp/pom.xml 2008-12-30 10:47:02 UTC (rev 12059)
+++ trunk/test-applications/seamApp/pom.xml 2008-12-30 10:54:41 UTC (rev 12060)
@@ -8,7 +8,7 @@
<name>sample application</name>
<properties>
<projectName>seamApp</projectName>
- <richfacesVersion>3.3.0-SNAPSHOT</richfacesVersion>
+ <rfVersion>3.3.0-SNAPSHOT</rfVersion>
<seamVersion>2.1.0.SP1</seamVersion>
<jbossDownloadURL>http://downloads.sourceforge.net/jboss/jboss-4.2.2.GA.zip</jbossDownloadURL>
<jbossDeployDir>jboss-4.2.2.GA/jboss-4.2.2.GA/server/default/</jbossDeployDir>
Modified: trunk/test-applications/seamApp/web/pom.xml
===================================================================
--- trunk/test-applications/seamApp/web/pom.xml 2008-12-30 10:47:02 UTC (rev 12059)
+++ trunk/test-applications/seamApp/web/pom.xml 2008-12-30 10:54:41 UTC (rev 12060)
@@ -81,17 +81,17 @@
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-api</artifactId>
- <version>${richfacesVersion}</version>
+ <version>${rfVersion}</version>
</dependency>
<dependency>
<groupId>org.richfaces.framework</groupId>
<artifactId>richfaces-impl</artifactId>
- <version>${richfacesVersion}</version>
+ <version>${rfVersion}</version>
</dependency>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>richfaces-ui</artifactId>
- <version>${richfacesVersion}</version>
+ <version>${rfVersion}</version>
</dependency>
<dependency>
<groupId>com.sun.facelets</groupId>
15 years, 3 months
JBoss Rich Faces SVN: r12059 - in trunk/ui/editor/src/main/java/org/richfaces/renderkit: resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2008-12-30 05:47:02 -0500 (Tue, 30 Dec 2008)
New Revision: 12059
Modified:
trunk/ui/editor/src/main/java/org/richfaces/renderkit/EditorRendererBase.java
trunk/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java
Log:
Refactoring after code review
Modified: trunk/ui/editor/src/main/java/org/richfaces/renderkit/EditorRendererBase.java
===================================================================
--- trunk/ui/editor/src/main/java/org/richfaces/renderkit/EditorRendererBase.java 2008-12-30 10:39:32 UTC (rev 12058)
+++ trunk/ui/editor/src/main/java/org/richfaces/renderkit/EditorRendererBase.java 2008-12-30 10:47:02 UTC (rev 12059)
@@ -22,6 +22,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.net.URL;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -37,6 +38,7 @@
import org.ajax4jsf.javascript.ScriptUtils;
import org.ajax4jsf.resource.InternetResource;
+import org.ajax4jsf.resource.util.URLToStreamHelper;
import org.ajax4jsf.util.InputUtils;
import org.richfaces.component.UIEditor;
@@ -74,20 +76,6 @@
return InputUtils.getConvertedValue(context, component, submittedValue);
}
- /**
- * Method to get converted to String model value for component
- *
- * @param context - faces context instance
- * @param component - component for which method is applied
- * @param value - component value
- * @return converted to String model value
- */
- //TODO nick - do we really need this method?
- protected String getConvertedStringValue(FacesContext context,
- UIEditor component, Object value) {
- return InputUtils.getConvertedStringValue(context, component, value);
- }
-
/* (non-Javadoc)
* @see org.richfaces.renderkit.InputRendererBase#doDecode(javax.faces.context.FacesContext, javax.faces.component.UIComponent)
*/
@@ -115,8 +103,8 @@
UIEditor component) {
String fieldValue = (String) component.getSubmittedValue();
if (fieldValue == null) {
- fieldValue = getConvertedStringValue(context, component, component
- .getValue());
+ fieldValue = InputUtils.getConvertedStringValue(context, component,
+ component.getValue());
}
return fieldValue;
}
@@ -152,11 +140,6 @@
InternetResource resource = getResource(resourceName);
String resourceUri = resource.getUri(context, null);
String suffix = resourceUri.substring(resourceUri.indexOf(resourceName) + resourceName.length());
-
- //TODO nick - I doubt suffix can be null
- if(suffix == null){
- suffix = "";
- }
return suffix;
}
@@ -173,31 +156,9 @@
ResponseWriter writer = context.getResponseWriter();
writer.writeText("var tinyMceParams = ", null);
- String configName = component.getConfiguration();
- if (configName != null && configName.length() > 0) {
- Properties parameters = new Properties();
- try {
- ClassLoader loader = Thread.currentThread()
- .getContextClassLoader();
-
- //TODO nick - use org.ajax4jsf.resource.util.URLToStreamHelper.urlToStream(URL)
- InputStream is = loader.getResourceAsStream(configName
- + ".properties");
- if (is == null) {
- throw new FacesException(
- "Editor configuration properties file with name '"
- + configName
- + "' was not found in class path");
- }
-
- //TODO nick - streams should be closed, in finally block
- parameters.load(is);
- writer.writeText(this.convertProperties(parameters), null);
- writer.writeText(";\n", null);
- } catch (IOException e) {
- throw new FacesException(e);
- }
-
+ String parametersConfigName = component.getConfiguration();
+ if (parametersConfigName != null && parametersConfigName.length() > 0) {
+ loadPropertiesAndWrite(context, parametersConfigName, writer, false);
} else {
writer.writeText("{};\n", null);
}
@@ -211,34 +172,59 @@
* @param component - Editor component instance
* @throws IOException
*/
- //TODO nick - merge with writeEditorConfigurationParameters() method
+ //XXX nick - merge with writeEditorConfigurationParameters() method
public void writeEditorCustomPluginsParameters(FacesContext context,
UIEditor component) throws IOException {
ResponseWriter writer = context.getResponseWriter();
- String configName = component.getCustomPlugins();
- if (configName != null && configName.length() > 0) {
- Properties parameters = new Properties();
+ String customPluginsConfigName = component.getCustomPlugins();
+ if (customPluginsConfigName != null && customPluginsConfigName.length() > 0) {
+ loadPropertiesAndWrite(context, customPluginsConfigName, writer, true);
+ }
+ }
+
+ /**
+ * Method to load configuration parameters from property file and write them
+ * @param context
+ * @param configName
+ * @param writer
+ * @param cutomPlugins
+ */
+ private void loadPropertiesAndWrite(FacesContext context,
+ String configName, ResponseWriter writer, boolean cutomPlugins) {
+ Properties parameters = new Properties();
+ try {
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+
+ // XXX nick - use org.ajax4jsf.resource.util.URLToStreamHelper.urlToStream(URL)
+ URL url = loader.getResource(configName + ".properties");
+ InputStream is = URLToStreamHelper.urlToStream(url);
+ if (is == null) {
+ throw new FacesException(
+ "Editor configuration properties file with name '"
+ + configName + "' was not found in class path");
+ }
+
+ // XXX nick - streams should be closed, in finally block
try {
- ClassLoader loader = Thread.currentThread()
- .getContextClassLoader();
- InputStream is = loader.getResourceAsStream(configName
- + ".properties");
- if (is == null) {
- throw new FacesException(
- "Editor configuration properties file with name '"
- + configName
- + "' was not found in class path");
- }
parameters.load(is);
- writer.writeText("\n", null);
- writer.writeText(this.getCustomPluginsCode(context, parameters), null);
- writer.writeText("\n", null);
- } catch (IOException e) {
+ } catch (Exception e) {
throw new FacesException(e);
+ } finally {
+ is.close();
}
-
+ writer.writeText("\n", null);
+ if (cutomPlugins) {
+ writer.writeText(
+ this.getCustomPluginsCode(context, parameters), null);
+ } else {
+ writer.writeText(this.convertProperties(parameters), null);
+ }
+ writer.writeText(";\n", null);
+ } catch (IOException e) {
+ throw new FacesException(e);
}
+
}
/**
@@ -300,87 +286,93 @@
UIEditor component) throws IOException {
ResponseWriter writer = context.getResponseWriter();
- if (component.getTheme() != null && component.getTheme().length() > 0) {
+ String theme = component.getTheme();
+ String language = component.getLanguage();
+ String plugins = component.getPlugins();
+ String oninit = component.getOninit();
+ String onsave = component.getOnsave();
+ String onchange = component.getOnchange();
+ String onsetup = component.getOnsetup();
+ String dialogType = component.getDialogType();
+ String skin = component.getSkin();
+ Integer width = component.getWidth();
+ Integer height = component.getHeight();
+
+ if (theme != null && theme.length() > 0) {
writer.writeText("tinyMceParams.theme = "
- + ScriptUtils.toScript(component.getTheme()) + ";\n", null);
+ + ScriptUtils.toScript(theme) + ";\n", null);
}
- if (component.getLanguage() != null
- && component.getLanguage().length() > 0) {
+ if (language != null && language.length() > 0) {
writer.writeText("tinyMceParams.language = "
- + ScriptUtils.toScript(component.getLanguage()) + ";\n",
- null);
+ + ScriptUtils.toScript(language) + ";\n", null);
}
writer.writeText("tinyMceParams.auto_resize = "
- + ScriptUtils.toScript(component.isAutoResize()) + ";\n",
- null);
+ + ScriptUtils.toScript(component.isAutoResize()) + ";\n", null);
writer.writeText("tinyMceParams.readonly = "
- + ScriptUtils.toScript(component.isReadonly()) + ";\n",
- null);
- if (component.getPlugins() != null
- && component.getPlugins().length() > 0) {
+ + ScriptUtils.toScript(component.isReadonly()) + ";\n", null);
+
+ if (plugins != null && plugins.length() > 0) {
writer.writeText("tinyMceParams.plugins = "
- + ScriptUtils.toScript(component.getPlugins()) + ";\n",
- null);
+ + ScriptUtils.toScript(plugins) + ";\n", null);
}
- if (component.getWidth() != null) {
+ if (width != null) {
writer.writeText("tinyMceParams.width = "
- + ScriptUtils.toScript(component.getWidth()) + ";\n", null);
+ + ScriptUtils.toScript(width) + ";\n", null);
}
- if (component.getHeight() != null) {
- writer
- .writeText("tinyMceParams.height = "
- + ScriptUtils.toScript(component.getHeight())
- + ";\n", null);
+ if (height != null) {
+ writer.writeText("tinyMceParams.height = "
+ + ScriptUtils.toScript(height) + ";\n", null);
}
-
- //TODO nick - use local variables
- if (component.getOninit() != null && component.getOninit().length() > 0) {
+
+ // XXX nick - use local variables
+ if (oninit != null && oninit.length() > 0) {
writer.writeText("tinyMceParams.oninit = function (event) {\n"
- + component.getOninit() + "\n" + "};\n", null);
+ + oninit + "\n" + "};\n", null);
}
- if (component.getOnsave() != null && component.getOnsave().length() > 0) {
- writer.writeText(
- "tinyMceParams.save_callback = function (event, element_id, html, body) {\n return "
- + component.getOnsave() + "\n" + "};\n", null);
+ if (onsave != null && onsave.length() > 0) {
+ writer
+ .writeText(
+ "tinyMceParams.save_callback = function (event, element_id, html, body) {\n return "
+ + onsave + "\n" + "};\n", null);
}
- if (component.getOnchange() != null
- && component.getOnchange().length() > 0) {
+ if (onchange != null && onchange.length() > 0) {
writer.writeText(
"tinyMceParams.onchange_callback = function (event, inst) {\n"
- + component.getOnchange() + "\n" + "};\n", null);
+ + onchange + "\n" + "};\n", null);
}
- if (component.getOnsetup() != null
- && component.getOnsetup().length() > 0) {
+ if (onsetup != null && onsetup.length() > 0) {
writer.writeText("tinyMceParams.setup = function (event, ed) {\n"
- + component.getOnsetup() + "\n" + "};\n", null);
+ + onsetup + "\n" + "};\n", null);
}
- if (component.getDialogType() != null
- && component.getDialogType().length() > 0) {
+ if (dialogType != null && dialogType.length() > 0) {
writer.writeText("tinyMceParams.dialog_type = "
- + ScriptUtils.toScript(component.getDialogType()) + ";\n",
- null);
+ + ScriptUtils.toScript(dialogType) + ";\n", null);
}
- if (component.getSkin() != null && component.getSkin().length() > 0) {
+ if (skin != null && skin.length() > 0) {
writer.writeText("tinyMceParams.skin = "
- + ScriptUtils.toScript(component.getSkin()) + ";\n", null);
+ + ScriptUtils.toScript(skin) + ";\n", null);
} else {
writer.writeText("if(!tinyMceParams.skin){\n", null);
writer.writeText(" tinyMceParams.skin = 'richfaces';\n", null);
writer.writeText("}\n", null);
}
-
- writer.writeText("if(tinyMceParams.strict_loading_mode == null){\n", null);
+
+ writer.writeText("if(tinyMceParams.strict_loading_mode == null){\n",
+ null);
writer.writeText(" tinyMceParams.strict_loading_mode = true;\n", null);
writer.writeText("}\n", null);
}
/**
- * Method to write tinyMCE configuration script parameters which was defined as <f:param> children for Editor
+ * Method to write tinyMCE configuration script parameters which was defined
+ * as <f:param> children for Editor
*
- * @param context - faces context instance
- * @param component - Editor component instance
+ * @param context -
+ * faces context instance
+ * @param component -
+ * Editor component instance
* @throws IOException
*/
public void writeEditorParameters(FacesContext context,
@@ -415,10 +407,8 @@
* @return true if needed or false if only target textarea should be rendered
*/
public boolean shouldRenderTinyMCE(UIEditor component) {
- //TODO nick - use TINY_MCE_DISABLED_MODE.equalsIgnoreCase(component.getViewMode())
- if (component.getViewMode() != null
- && component.getViewMode().equalsIgnoreCase(
- TINY_MCE_DISABLED_MODE)) {
+ //XXX nick - use TINY_MCE_DISABLED_MODE.equalsIgnoreCase(component.getViewMode())
+ if (TINY_MCE_DISABLED_MODE.equalsIgnoreCase(component.getViewMode())) {
return false;
} else {
return true;
Modified: trunk/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java
===================================================================
--- trunk/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-12-30 10:39:32 UTC (rev 12058)
+++ trunk/ui/editor/src/main/java/org/richfaces/renderkit/resources/EditorHTMLRenderer.java 2008-12-30 10:47:02 UTC (rev 12059)
@@ -21,12 +21,10 @@
package org.richfaces.renderkit.resources;
import java.io.BufferedReader;
-import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream;
-import java.io.OutputStreamWriter;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -55,6 +53,11 @@
/** Regular expression pattern for finding elements for replacing and correcting */
private final static Pattern REGEXP = Pattern.compile("\\<(script|link|img|iframe)\\s+.*(?:src|href)\\s*=\\s*[\"']([^'\"]+)\\.([^\\'\"]+)[\"'][^>]*\\>", Pattern.CASE_INSENSITIVE);
+ /** Script resource suffix due to servlet or filter mappings */
+ private String scriptSuffix;
+ /** XCSS resource suffix due to servlet or filter mappings */
+ private String xcssSuffix;
+
/* (non-Javadoc)
* @see org.ajax4jsf.resource.BaseResourceRenderer#getCommonAttrs()
*/
@@ -118,12 +121,11 @@
int total = 0;
BufferedReader br = new BufferedReader(new InputStreamReader(in));
- //TODO nick - why we need BufferedWriter?
- BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(out));
+ //XXX nick - why we need BufferedWriter?
- //TODO nick - cannot be changed in runtime, cache in private field
- String scriptSuffix = getSriptMappingSuffix();
- String cssSuffix = getCssMappingSuffix();
+ //XXX nick - cannot be changed in runtime, cache in private field
+ String scriptSuffix = getScriptSuffix();
+ String cssSuffix = getXcssSuffix();
Pattern pattern = REGEXP;
@@ -155,16 +157,13 @@
line = line.replace(path + "." + extension, path + "." + (extension.charAt(0)=='c' ? "xcss" : "XCSS") + cssSuffix);
}
}
- bw.write(line);
- bw.newLine();
+ line += "\n";
+ out.write(line.getBytes());
total += line.getBytes().length;
}
} finally {
- //TODO nick - close always flushes, no need to do that explicitly
- bw.flush();
+ //XXX nick - close always flushes, no need to do that explicitly
br.close();
- bw.close();
- in.close();
out.close();
}
return total;
@@ -213,5 +212,29 @@
public boolean requireFacesContext() {
return true;
}
+
+ /**
+ * Getter for scriptSuffix
+ *
+ * @return the scriptSuffix
+ */
+ public String getScriptSuffix() {
+ if(scriptSuffix == null){
+ scriptSuffix = getSriptMappingSuffix();
+ }
+ return scriptSuffix;
+ }
+ /**
+ * Getter for xcssSuffix
+ *
+ * @return the xcssSuffix
+ */
+ public String getXcssSuffix() {
+ if(xcssSuffix == null){
+ xcssSuffix = getCssMappingSuffix();
+ }
+ return xcssSuffix;
+ }
+
}
15 years, 3 months
JBoss Rich Faces SVN: r12058 - in trunk/samples/richfaces-demo/src/main/webapp: templates/include and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-12-30 05:39:32 -0500 (Tue, 30 Dec 2008)
New Revision: 12058
Modified:
trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml
trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-4910
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2008-12-30 02:22:52 UTC (rev 12057)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-group.xhtml 2008-12-30 10:39:32 UTC (rev 12058)
@@ -9,7 +9,7 @@
<tbody>
<a4j:repeat var="component" value="#{components}">
<tr class="#{component.current?'active':'unactive'}" onmouseover="this.className='active'" onmouseout="this.className='#{component.current?'active':'unactive'}'">
- <td class="ico"><h:graphicImage value="#{component.iconImage}" width="16" height="16" alt="" border="0" /><h:graphicImage value="/images/icons/ico_new_item.gif" rendered="#{component.newComponent}" style="position:relative; top:-6px; left:10px;" alt="" width="10" height="10"/></td>
+ <td class="ico"><div style="width: 16px;height: 16px;"><h:graphicImage value="#{component.iconImage}" width="16" height="16" alt="" border="0" /><h:graphicImage value="/images/icons/ico_new_item.gif" rendered="#{component.newComponent}" style="position:relative; top:-6px; left:10px;" alt="" width="10" height="10"/></div></td>
<td class="text #{component.newComponent?'bold':''}" width="100%">
<h:outputLink style="display:block;height:20px" value="#{component.contextRelativeDemoLocation}">
<span style="display:block;padding-top:3px;text-decoration : none; color : #000000;">
Modified: trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-12-30 02:22:52 UTC (rev 12057)
+++ trunk/samples/richfaces-demo/src/main/webapp/templates/include/components-navigation.xhtml 2008-12-30 10:39:32 UTC (rev 12058)
@@ -6,7 +6,7 @@
xmlns:rich="http://richfaces.org/rich">
<ui:composition>
<rich:panel styleClass="panel_menu" bodyClass="rich-laguna-panel-no-header">
-<rich:panelBar style="width: auto;" selectedPanel="#{componentNavigator.currentComponent.group}" height="690px" contentStyle="background:none;">
+<rich:panelBar style="width: auto;" selectedPanel="#{componentNavigator.currentComponent.group}" height="670px" contentStyle="background:none;">
<rich:panelBarItem id="ajaxSupport">
<f:facet name="label">
<h:panelGroup layout="block">
Modified: trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml 2008-12-30 02:22:52 UTC (rev 12057)
+++ trunk/samples/richfaces-demo/src/main/webapp/welcome.xhtml 2008-12-30 10:39:32 UTC (rev 12058)
@@ -25,8 +25,9 @@
skins on the application whole look-and-feel.
</p>
<p class="note">
- Components which names marked with bold text in left-hand sidebar was introduced
- in latest official GA or the component page has new examples inside.
+ Pay your attention to "New" green marks on the left navigation bar.<br/>
+ Groups marked with such icons - contains the components added during latest release,
+ or the components with new examples added.
</p>
</ui:define>
</ui:composition>
15 years, 3 months
JBoss Rich Faces SVN: r12057 - trunk/sandbox/ui/colorPicker/design.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-12-29 21:22:52 -0500 (Mon, 29 Dec 2008)
New Revision: 12057
Modified:
trunk/sandbox/ui/colorPicker/design/colorPicker.html
trunk/sandbox/ui/colorPicker/design/ui.colorpicker.js
Log:
rich:colorPicker design: cancel button was added
Modified: trunk/sandbox/ui/colorPicker/design/colorPicker.html
===================================================================
--- trunk/sandbox/ui/colorPicker/design/colorPicker.html 2008-12-30 01:36:33 UTC (rev 12056)
+++ trunk/sandbox/ui/colorPicker/design/colorPicker.html 2008-12-30 02:22:52 UTC (rev 12057)
@@ -17,7 +17,7 @@
position: relative;
background-color: #ECF4FE;
border: 1px solid #BED6F8;
- height: 164px;
+ height: 170px;
padding: 0px;
margin: 0px;
}
@@ -91,9 +91,9 @@
}
.rich-colorPicker-hex-wrapper {
height:22px;
- left:200px;
+ left:202px;
position:absolute;
- top:135px;
+ top:119px;
}
.rich-colorPicker-rgb-wrapper{
@@ -116,13 +116,13 @@
margin-bottom: 2px
}
.rich-colorPicker-hsb-h, .rich-colorPicker-rgb-r{
- top:55px;
+ top:45px;
}
.rich-colorPicker-hsb-s, .rich-colorPicker-rgb-g{
- top:80px;
+ top:70px;
}
.rich-colorPicker-hsb-b, .rich-colorPicker-rgb-b{
- top:105px;
+ top:95px;
}
@@ -145,13 +145,15 @@
font-size: 13px;
}
-.rich-colorPicker-submit{
+.rich-colorPicker-submit, .rich-colorPicker-cancel{
position:absolute;
- right:7px;
- top:136px;
+right:75px;
+top:144px;
border: 1px solid #BED6F8;
}
-
+.rich-colorPicker-cancel{
+right:7px;
+}
.rich-colorPicker-span input{
border: 1px solid #BED6F8;
font-size: 12px;
@@ -253,6 +255,7 @@
<input id="hsb-b" type="text" maxlength="3" size="2" />
</div>
<button type="button" class="rich-colorPicker-submit" name="submit">Apply</button>
+ <button type="button" class="rich-colorPicker-cancel" name="cancel">Cancel</button>
</div>
</div>
Modified: trunk/sandbox/ui/colorPicker/design/ui.colorpicker.js
===================================================================
--- trunk/sandbox/ui/colorPicker/design/ui.colorpicker.js 2008-12-30 01:36:33 UTC (rev 12056)
+++ trunk/sandbox/ui/colorPicker/design/ui.colorpicker.js 2008-12-30 02:22:52 UTC (rev 12057)
@@ -100,6 +100,11 @@
.bind('mouseenter', function(e) { return self._enterSubmit.call(self, e); })
.bind('mouseleave', function(e) { return self._leaveSubmit.call(self, e); })
.bind('click', function(e) { return self._clickSubmit.call(self, e); });
+
+ this.picker.find('.rich-colorPicker-cancel')
+ .bind('mouseenter', function(e) { return self._enterCancel.call(self, e); })
+ .bind('mouseleave', function(e) { return self._leaveCancel.call(self, e); })
+ .bind('click', function(e) { return self._clickCancel.call(self, e); });
this._fillRGBFields(this.color);
this._fillHSBFields(this.color);
@@ -336,7 +341,13 @@
},
_leaveSubmit: function(e) {
this.picker.find('.rich-colorPicker-submit').removeClass('rich-colorPicker-focus');
+ },
+ _enterCancel: function(e) {
+ this.picker.find('.rich-colorPicker-cancel').addClass('rich-colorPicker-focus');
},
+ _leaveCancel: function(e) {
+ this.picker.find('.rich-colorPicker-cancel').removeClass('rich-colorPicker-focus');
+ },
_clickSubmit: function(e) {
var col = this.color;
@@ -347,6 +358,11 @@
this.picker.hide();
$(document).unbind('mousedown.colorPicker');
return false;
+ },
+ _clickCancel: function(e) {
+ this.picker.hide();
+ $(document).unbind('mousedown.colorPicker');
+ return false;
},
_show: function(e) {
15 years, 3 months
JBoss Rich Faces SVN: r12056 - trunk/sandbox/ui/colorPicker/design.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-12-29 20:36:33 -0500 (Mon, 29 Dec 2008)
New Revision: 12056
Modified:
trunk/sandbox/ui/colorPicker/design/colorPicker.html
Log:
rich:colorPicker design was edited
Modified: trunk/sandbox/ui/colorPicker/design/colorPicker.html
===================================================================
--- trunk/sandbox/ui/colorPicker/design/colorPicker.html 2008-12-30 01:34:55 UTC (rev 12055)
+++ trunk/sandbox/ui/colorPicker/design/colorPicker.html 2008-12-30 01:36:33 UTC (rev 12056)
@@ -197,10 +197,8 @@
<body style="height: 10000px">
<br /><br /><br /><br /><br /><br /><br />
<br /><br /><br /><br /><br /><br /><br />
-<br /><br /><br /><br /><br /><br /><br />
-<br /><br /><br /><br /><br /><br /><br />
-<br /><br /><br /><br /><br /><br /><br />
-<br /><br /><br /><br /><br /><br /><br />
+
+
<span id="rich-colorPicker" class="rich-colorPicker-span">
<input readonly="readonly"/>
<img src="images/arrow.gif" alt="icon" class="rich-colorPicker-icon" vertical-align="middle" />
@@ -208,6 +206,7 @@
<input type="button" value="Set red color in RGB format" onclick="$('#rich-colorPicker').colorPicker('setColor', {r:255,g:0,b:0})"/>
<input type="button" value="Set gray color in HEX format" onclick="$('#rich-colorPicker').colorPicker('setColor', '#cccccc')"/>
<input type="button" value="Set seagreen color in HSB format" onclick="$('#rich-colorPicker').colorPicker('setColor', {h:160,s:100,b:100})"/>
+
<br /><br /><br /><br /><br /><br /><br />
<br /><br /><br /><br /><br /><br /><br />
<br /><br /><br /><br /><br /><br /><br />
15 years, 3 months
JBoss Rich Faces SVN: r12055 - trunk/framework/impl/src/main/javascript/ajaxjsf.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-12-29 20:34:55 -0500 (Mon, 29 Dec 2008)
New Revision: 12055
Modified:
trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
Log:
Added line to debug code - 'Processing updates finished, no oncomplete function to call'
Modified: trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js
===================================================================
--- trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-12-30 01:33:46 UTC (rev 12054)
+++ trunk/framework/impl/src/main/javascript/ajaxjsf/JSFAJAX.js 2008-12-30 01:34:55 UTC (rev 12055)
@@ -1179,6 +1179,8 @@
0);
} else {
+ LOG.debug( "Processing updates finished, no oncomplete function to call" );
+
setTimeout(function() {
// mark status object ( if any ) for complete request ;
A4J.AJAX.status(request.containerId,options.status,false);
15 years, 3 months
JBoss Rich Faces SVN: r12054 - trunk/sandbox/ui/colorPicker/design.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-12-29 20:33:46 -0500 (Mon, 29 Dec 2008)
New Revision: 12054
Modified:
trunk/sandbox/ui/colorPicker/design/colorPicker.html
trunk/sandbox/ui/colorPicker/design/ui.colorpicker.js
Log:
rich:colorPicker design was edited
Modified: trunk/sandbox/ui/colorPicker/design/colorPicker.html
===================================================================
--- trunk/sandbox/ui/colorPicker/design/colorPicker.html 2008-12-29 23:35:58 UTC (rev 12053)
+++ trunk/sandbox/ui/colorPicker/design/colorPicker.html 2008-12-30 01:33:46 UTC (rev 12054)
@@ -164,6 +164,7 @@
height:16px;
width:16px;
vertical-align:middle;
+ border: 1px solid #BED6F8;
}
</style>
@@ -178,13 +179,14 @@
$('div.rich-colorPicker-color').pngFix();
}
$("#rich-colorPicker").colorPicker({
+ eventName: 'click',
flat: false,
color: "#807540",
/*color: {r:128,g:117,b:64},*/
/*color: {h:50,s:50,b:50}*/
clientId: "#rich-colorPicker",
submit: function(e, ui) {
- $("#rich-colorPicker input").val(ui.hex);
+ $("#rich-colorPicker input").val('#'+ui.hex);
}
});
});
@@ -195,10 +197,21 @@
<body style="height: 10000px">
<br /><br /><br /><br /><br /><br /><br />
<br /><br /><br /><br /><br /><br /><br />
+<br /><br /><br /><br /><br /><br /><br />
+<br /><br /><br /><br /><br /><br /><br />
+<br /><br /><br /><br /><br /><br /><br />
+<br /><br /><br /><br /><br /><br /><br />
<span id="rich-colorPicker" class="rich-colorPicker-span">
<input readonly="readonly"/>
<img src="images/arrow.gif" alt="icon" class="rich-colorPicker-icon" vertical-align="middle" />
</span>
+<input type="button" value="Set red color in RGB format" onclick="$('#rich-colorPicker').colorPicker('setColor', {r:255,g:0,b:0})"/>
+<input type="button" value="Set gray color in HEX format" onclick="$('#rich-colorPicker').colorPicker('setColor', '#cccccc')"/>
+<input type="button" value="Set seagreen color in HSB format" onclick="$('#rich-colorPicker').colorPicker('setColor', {h:160,s:100,b:100})"/>
+<br /><br /><br /><br /><br /><br /><br />
+<br /><br /><br /><br /><br /><br /><br />
+<br /><br /><br /><br /><br /><br /><br />
+<br /><br /><br /><br /><br /><br /><br />
<div id="rich-colorPicker-ui" class="rich-colorPicker-wrapper">
<div class="rich-colorPicker-ext">
<div class="rich-colorPicker-color">
@@ -243,5 +256,7 @@
<button type="button" class="rich-colorPicker-submit" name="submit">Apply</button>
</div>
</div>
+
+
</body>
</html>
Modified: trunk/sandbox/ui/colorPicker/design/ui.colorpicker.js
===================================================================
--- trunk/sandbox/ui/colorPicker/design/ui.colorpicker.js 2008-12-29 23:35:58 UTC (rev 12053)
+++ trunk/sandbox/ui/colorPicker/design/ui.colorpicker.js 2008-12-30 01:33:46 UTC (rev 12054)
@@ -58,7 +58,7 @@
_init: function() {
- this.charMin = 67;
+ this.charMin = 65;
var o = this.options, self = this,
tpl = $(o.clientId.toString()+"-ui");
@@ -208,7 +208,7 @@
this._trigger('change', e, { options: this.options, hsb: col, hex: this._HSBToHex(col), rgb: this._HSBToRGB(col) });
},
_blur: function(e) {
-
+/*
var col = this.color;
this._fillRGBFields(col);
this._fillHSBFields(col);
@@ -216,7 +216,8 @@
this._setHue(col);
this._setSelector(col);
this._setNewColor(col);
- this._setIconColor(col);
+ this._setIconColor(col);
+*/
this.fields.parent().removeClass('rich-colorPicker-focus');
},
@@ -342,9 +343,10 @@
this.origColor = col;
this._setCurrentColor(col);
this._setIconColor(col);
- this._trigger("submit", e, { options: this.options, hsb: col, hex: this._HSBToHex(col), rgb: this._HSBToRGB(col) });
+ this._trigger("submit", e, { options: this.options, hsb: col, hex: this._HSBToHex(col), rgb: this._HSBToRGB(col) });
+ this.picker.hide();
+ $(document).unbind('mousedown.colorPicker');
return false;
-
},
_show: function(e) {
@@ -514,14 +516,5 @@
}
-});
-
-$.extend($.ui.colorPicker, {
- defaults: {
- eventName: 'click',
- color: 'ff0000',
- flat: false
- }
-});
-
+});
})(jQuery);
15 years, 3 months