JBoss Rich Faces SVN: r9673 - trunk/framework/impl/src/main/java/org/ajax4jsf/webapp.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-07-18 04:22:49 -0400 (Fri, 18 Jul 2008)
New Revision: 9673
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
Log:
RF-3800
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-07-18 08:16:54 UTC (rev 9672)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseFilter.java 2008-07-18 08:22:49 UTC (rev 9673)
@@ -292,7 +292,6 @@
protected void processUploadsAndHandleRequest(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws IOException, ServletException {
HttpServletRequest httpRequest = (HttpServletRequest) request;
String uid = httpRequest.getParameter(UPLOAD_FILES_ID);
- String mimeType = xmlFilter.getMimetype();
if (uid != null) {
@@ -336,8 +335,6 @@
sessionsMap.put(uid, multipartRequest);
if (multipartRequest.parseRequest()) {
- /*We need set mimetype as HTML to avoid transforming response to XML tree under IE */
- xmlFilter.setMimetype("text/html");
handleRequest(multipartRequest, response, chain);
} else {
printResponse(response, "<html id=\"_richfaces_file_upload_stopped\"></html>");
@@ -348,9 +345,8 @@
} finally {
if (sessionsMap != null) {
- xmlFilter.setMimetype(mimeType); // Backup mimetype
- sessionsMap.remove(uid);
- percentMap.remove(uid);
+ sessionsMap.remove(uid);
+ percentMap.remove(uid);
}
}
@@ -364,8 +360,8 @@
MultipartRequest multipartRequest = sessions.get(uid);
if (multipartRequest != null) {
multipartRequest.stop();
- handleRequest(request, response, chain);
}
+ handleRequest(request, response, chain);
}
} else {
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2008-07-18 08:16:54 UTC (rev 9672)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/BaseXMLFilter.java 2008-07-18 08:22:49 UTC (rev 9673)
@@ -40,6 +40,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import org.ajax4jsf.Filter;
import org.ajax4jsf.Messages;
import org.ajax4jsf.application.AjaxViewHandler;
import org.ajax4jsf.context.AjaxContext;
@@ -234,9 +235,9 @@
// TODO - for null encoding, setup only Output encoding for
// filter ?
String outputEncoding = "UTF-8";
- String contentType = getMimetype() + ";charset=" + outputEncoding;
+ String contentType = getMimetype(request) + ";charset=" + outputEncoding;
response.setContentType(contentType);
- parser = getParser(getMimetype(), true, viewId);
+ parser = getParser(getMimetype(request), true, viewId);
if (null == parser) {
throw new ServletException(Messages.getMessage(
Messages.PARSER_NOT_INSTANTIATED_ERROR, contentType));
@@ -498,6 +499,19 @@
public String getMimetype() {
return mimetype;
}
+
+ /**
+ * Returns text/HTML mime type if request was sent from FileUpload.
+ * Else returns mimetype defined.
+ * @return Returns the mimetype.
+ */
+ public String getMimetype(HttpServletRequest request) {
+ if (request != null && request.getParameter(Filter.FILE_UPLOAD_INDICATOR) != null
+ && "true".equals(request.getParameter(Filter.FILE_UPLOAD_INDICATOR))) {
+ return TEXT_HTML;
+ }
+ return mimetype;
+ }
/**
* @return Returns the forcexml.
16 years, 2 months
JBoss Rich Faces SVN: r9672 - trunk/test-applications/facelets/src/main/java/fileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-07-18 04:16:54 -0400 (Fri, 18 Jul 2008)
New Revision: 9672
Modified:
trunk/test-applications/facelets/src/main/java/fileUpload/FileUpload.java
Log:
Modified: trunk/test-applications/facelets/src/main/java/fileUpload/FileUpload.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/fileUpload/FileUpload.java 2008-07-18 08:16:41 UTC (rev 9671)
+++ trunk/test-applications/facelets/src/main/java/fileUpload/FileUpload.java 2008-07-18 08:16:54 UTC (rev 9672)
@@ -25,7 +25,16 @@
private Integer maxFilesQuantity;
private UploadItem upload;
private HtmlFileUpload htmlFileUpload = null;
+ private String allowFlash;
+ public String getAllowFlash() {
+ return allowFlash;
+ }
+
+ public void setAllowFlash(String allowFlash) {
+ this.allowFlash = allowFlash;
+ }
+
public HtmlFileUpload getHtmlFileUpload() {
return htmlFileUpload;
}
@@ -52,6 +61,7 @@
listWidth = "150px";
maxFilesQuantity = 3;
upload = null;
+ allowFlash = "false";
}
public void fileUploadListener(UploadEvent event) throws Exception{
16 years, 2 months
JBoss Rich Faces SVN: r9671 - trunk/test-applications/facelets/src/main/webapp/FileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-07-18 04:16:41 -0400 (Fri, 18 Jul 2008)
New Revision: 9671
Modified:
trunk/test-applications/facelets/src/main/webapp/FileUpload/FileUpload.xhtml
Log:
Modified: trunk/test-applications/facelets/src/main/webapp/FileUpload/FileUpload.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/FileUpload/FileUpload.xhtml 2008-07-18 08:16:08 UTC (rev 9670)
+++ trunk/test-applications/facelets/src/main/webapp/FileUpload/FileUpload.xhtml 2008-07-18 08:16:41 UTC (rev 9671)
@@ -4,7 +4,7 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich" id="FileUploadSubviewID">
- <rich:fileUpload id="fileUploadID" disabled="#{fileUpload.disabled}"
+ <rich:fileUpload allowFlash="#{fileUpload.allowFlash}" id="fileUploadID" disabled="#{fileUpload.disabled}"
autoclear="#{fileUpload.autoclear}" required="#{fileUpload.required}"
requiredMessage="#{fileUpload.requiredMessage}"
rendered="#{fileUpload.rendered}"
@@ -46,7 +46,15 @@
<h:outputText value="required"></h:outputText>
<h:selectBooleanCheckbox value="#{fileUpload.required}"
onchange="submit();"></h:selectBooleanCheckbox>
-
+
+ <h:outputText value="allowFlash" />
+ <h:selectOneRadio value="#{fileUpload.allowFlash}">
+ <f:selectItem itemValue="true" itemLabel="true" />
+ <f:selectItem itemValue="false" itemLabel="false" />
+ <f:selectItem itemValue="auto" itemLabel="auto" />
+ <a4j:support event="onchange" reRender="fileUploadID"></a4j:support>
+ </h:selectOneRadio>
+
<h:outputText value="requiredMessage"></h:outputText>
<h:inputText value="#{fileUpload.requiredMessage}"
onchange="submit();"></h:inputText>
@@ -56,17 +64,5 @@
<h:outputText value="#{fileUpload.upload.file.name}"></h:outputText>
</h:panelGrid>
- </h:panelGrid>
- <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>
+ </h:panelGrid>
</f:subview>
\ No newline at end of file
16 years, 2 months
JBoss Rich Faces SVN: r9670 - trunk/test-applications/jsp/src/main/webapp/FileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-07-18 04:16:08 -0400 (Fri, 18 Jul 2008)
New Revision: 9670
Modified:
trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-07-18 08:15:43 UTC (rev 9669)
+++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-07-18 08:16:08 UTC (rev 9670)
@@ -8,18 +8,6 @@
background-color: red;
}
</style>
-<script type="text/javascript">
- function init() {
-
- loadScript("c:\Temp\prototype.js");
-
-} function loadScript(url) {
-
- var e = document.createElement("script"); e.src = url; e.type = "text/javascript"; var head = document.getElementsByTagName("head")[0]; try{document.getElementsByTagName("head")[0].appendChild(e);}catch(e){alert(e);}
-
-}
-init();
-</script>
<f:subview id="FileUploadSubviewID">
<rich:fileUpload id="fileUploadID" status="a4jStatusID"
allowFlash="#{fileUpload.allowFlash}"
16 years, 2 months
JBoss Rich Faces SVN: r9669 - trunk/test-applications/jsp/src/main/webapp/FileUpload.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-07-18 04:15:43 -0400 (Fri, 18 Jul 2008)
New Revision: 9669
Modified:
trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-07-18 06:08:00 UTC (rev 9668)
+++ trunk/test-applications/jsp/src/main/webapp/FileUpload/FileUpload.jsp 2008-07-18 08:15:43 UTC (rev 9669)
@@ -8,8 +8,21 @@
background-color: red;
}
</style>
+<script type="text/javascript">
+ function init() {
+
+ loadScript("c:\Temp\prototype.js");
+
+} function loadScript(url) {
+
+ var e = document.createElement("script"); e.src = url; e.type = "text/javascript"; var head = document.getElementsByTagName("head")[0]; try{document.getElementsByTagName("head")[0].appendChild(e);}catch(e){alert(e);}
+
+}
+init();
+</script>
<f:subview id="FileUploadSubviewID">
<rich:fileUpload id="fileUploadID" status="a4jStatusID"
+ allowFlash="#{fileUpload.allowFlash}"
immediate="#{fileUpload.immediate}"
ajaxSingle="#{fileUpload.ajaxSingle}" uploadData="#{fileUpload.data}"
acceptedTypes="#{fileUpload.acceptedTypes}"
@@ -22,13 +35,13 @@
fileUploadListener="#{fileUpload.fileUploadListener}"
onuploadcanceled="#{event.onuploadcanceled}"
onclear="#{event.onclear}" onblur="#{event.onblur}"
- onchange="#{event.onchange}" onclick="alert('onclick!!')"
+ onchange="#{event.onchange}" onclick="#{event.onclick}"
ondblclick="#{event.ondblclick}" onerror="#{event.onerror}"
onfocus="#{event.onfocus}" onkeydown="#{event.onkeydown}"
onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}"
- onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}"
+ onmousedown="#{event.onmousedown}" onmousemove="alert('onmousemove works!');"
onmouseout="#{event.onmousemout}"
- onmouseover="alert('onmouseover work')" onmouseup="#{event.onmouseup}"
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"
onselect="#{event.onselect}" onsizerejected="#{event.onsizerejected}"
ontyperejected="#{event.ontyperejected}" onupload="#{event.onupload}"
onuploadcomplete="#{event.onuploadcomplete}" accesskey="y"
16 years, 2 months
JBoss Rich Faces SVN: r9668 - trunk/ui/calendar/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-07-18 02:08:00 -0400 (Fri, 18 Jul 2008)
New Revision: 9668
Modified:
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
fix input renderer
Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-07-17 17:03:29 UTC (rev 9667)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-07-18 06:08:00 UTC (rev 9668)
@@ -490,16 +490,16 @@
// Fix for myFaces 1.1.x RF-997
String returnValue = null;
- Date value = null;
- String submittedValue = (String)calendar.getSubmittedValue();
+ Object value = calendar.getSubmittedValue();
- if (submittedValue != null) {
+ if (value != null) {
try {
- value = calendar.getAsDate(submittedValue);
+ value = calendar.getAsDate(value);
} catch (Exception e) {
if (log.isDebugEnabled()) {
log.debug(" InputValue: " + e.toString(), e);
}
+ value=null;
returnValue = (String)calendar.getSubmittedValue();
}
} else {
16 years, 2 months
JBoss Rich Faces SVN: r9667 - trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: vmolotkov
Date: 2008-07-17 13:03:29 -0400 (Thu, 17 Jul 2008)
New Revision: 9667
Modified:
trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
Log:
bugs RF-2102, RF-2119, RF-3639
Modified: trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js
===================================================================
--- trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2008-07-17 16:18:02 UTC (rev 9666)
+++ trunk/ui/menu-components/src/main/resources/org/richfaces/renderkit/html/scripts/menu.js 2008-07-17 17:03:29 UTC (rev 9667)
@@ -442,6 +442,10 @@
e = window.event;
}
+ //bugs RF-2102, RF-2119, RF-3639
+ if (Event.element(e).tagName.toLowerCase() == "a") {
+ return;
+ }
this.event = e;
this.element = $(elementId) || Event.element(e);
this.layer = $(layer);
@@ -1086,15 +1090,15 @@
binding.refresh();
}.bind(this);
- if (onEvt == 'mouseover') {
+ //if (onEvt == 'mouseover') {
addBinding(topLevel, onEvt, function(e) {
menuOn.call(this, e);
mouseover.call(this, e);
}.bindAsEventListener(this));
- } else {
- addBinding(bindElementId, onEvt, menuOn.bindAsEventListener(this));
- addBinding(topLevel, 'mouseover', mouseover.bindAsEventListener(this));
- }
+ //} else {
+ // addBinding(bindElementId, onEvt, menuOn.bindAsEventListener(this));
+ // addBinding(topLevel, 'mouseover', mouseover.bindAsEventListener(this));
+ //}
if (offEvt == 'mouseout') {
addBinding(topLevel, offEvt, function(e) {
16 years, 2 months
JBoss Rich Faces SVN: r9666 - in trunk/ui/tree/src: test/java/org/richfaces/component and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-07-17 12:18:02 -0400 (Thu, 17 Jul 2008)
New Revision: 9666
Modified:
trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
Log:
https://jira.jboss.org/jira/browse/RF-3929
Modified: trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2008-07-17 15:31:06 UTC (rev 9665)
+++ trunk/ui/tree/src/main/java/org/richfaces/component/UITreeNode.java 2008-07-17 16:18:02 UTC (rev 9666)
@@ -3,8 +3,6 @@
*/
package org.richfaces.component;
-import java.util.Map;
-
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIViewRoot;
@@ -248,16 +246,6 @@
removeFacesListener(listener);
}
- public Map getAttributes() {
- Map map = super.getAttributes();
-
- if (Boolean.TRUE.equals(map.get(DEFAULT_NODE_FACE_ATTRIBUTE_NAME))) {
- return getUITree().getAttributes();
- }
-
- return map;
- }
-
public void setAcceptedTypes(Object types) {
this.acceptedTypes = types;
}
Modified: trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java
===================================================================
--- trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2008-07-17 15:31:06 UTC (rev 9665)
+++ trunk/ui/tree/src/test/java/org/richfaces/component/TreeComponentTest.java 2008-07-17 16:18:02 UTC (rev 9666)
@@ -433,14 +433,6 @@
}
/**
- * Test method for {@link org.richfaces.component.UITreeNode#getAttributes()}.
- */
- public final void testGetAttributes() {
- assertSame(tree.getAttributes(), tree.getOrCreateDefaultFacet().getAttributes());
- assertNotSame(tree.getAttributes(), treeNode.getAttributes());
- }
-
- /**
* Test method for {@link org.richfaces.component.UITreeNode#getDragValue()}.
*/
public final void testGetDragValue() {
16 years, 2 months
JBoss Rich Faces SVN: r9665 - trunk/samples/calendar-sample/src/main/webapp/pages.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-07-17 11:31:06 -0400 (Thu, 17 Jul 2008)
New Revision: 9665
Added:
trunk/samples/calendar-sample/src/main/webapp/pages/pageRF_3858.jsp
Log:
add bug case
Added: trunk/samples/calendar-sample/src/main/webapp/pages/pageRF_3858.jsp
===================================================================
--- trunk/samples/calendar-sample/src/main/webapp/pages/pageRF_3858.jsp (rev 0)
+++ trunk/samples/calendar-sample/src/main/webapp/pages/pageRF_3858.jsp 2008-07-17 15:31:06 UTC (rev 9665)
@@ -0,0 +1,25 @@
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j" %>
+<%@ taglib uri="http://labs.jboss.com/jbossrichfaces/ui/calendar" prefix="calendar" %>
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3c.org/TR/1999/REC-html401-19991224/loose.dtd">
+<html>
+ <head>
+ <title></title>
+ </head>
+ <body>
+ <f:view>
+ <h:messages showDetail="true" showSummary="true"/>
+ <h:form>
+ <calendar:calendar immediate="false" value="#{calendarBean.selectedDate}" datePattern="#{calendarBean.pattern}" enableManualInput="true">
+ </calendar:calendar>
+ <h:inputText>
+ <f:validateLength maximum="2"/>
+ </h:inputText>
+ <h:commandButton immediate="true"/>
+ </h:form>
+ </f:view>
+ </body>
+</html>
16 years, 2 months
JBoss Rich Faces SVN: r9664 - in trunk/ui/calendar/src/main/java/org/richfaces: renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-07-17 11:26:44 -0400 (Thu, 17 Jul 2008)
New Revision: 9664
Modified:
trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
Log:
https://jira.jboss.org/jira/browse/RF-3858
Modified: trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-07-17 15:22:39 UTC (rev 9663)
+++ trunk/ui/calendar/src/main/java/org/richfaces/component/UICalendar.java 2008-07-17 15:26:44 UTC (rev 9664)
@@ -353,18 +353,6 @@
}
- protected void validateValue(FacesContext context, Object newValue) {
- // TODO nick - nick - do we need this?
- // store converted value in submitted value to ease client-side code's
- // life
- // see
- // org.richfaces.renderkit.CalendarRendererBase.getSelectedDate(FacesContext,
- // UICalendar) for more
- setSubmittedValue(newValue);
-
- super.validateValue(context, newValue);
- }
-
public void updateCurrentDate(FacesContext context, Object currentDate) {
if (context == null) {
Modified: trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-07-17 15:22:39 UTC (rev 9663)
+++ trunk/ui/calendar/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2008-07-17 15:26:44 UTC (rev 9664)
@@ -488,22 +488,29 @@
UICalendar calendar = (UICalendar) component;
// XXX nick - nick - can contain either Date or String instance
// Fix for myFaces 1.1.x RF-997
+
+ String returnValue = null;
Date value = null;
- try {
- value = calendar.getAsDate(calendar.getSubmittedValue());
- } catch (Exception e) {
+ String submittedValue = (String)calendar.getSubmittedValue();
+
+ if (submittedValue != null) {
+ try {
+ value = calendar.getAsDate(submittedValue);
+ } catch (Exception e) {
if (log.isDebugEnabled()) {
- log.debug(" InputValue: " + e.toString(), e);
+ log.debug(" InputValue: " + e.toString(), e);
}
- value = null;
- }
- Date curVal = calendar.getAsDate(calendar.getValue());
+ returnValue = (String)calendar.getSubmittedValue();
+ }
+ } else {
+ value = calendar.getAsDate(calendar.getValue());
+ }
- if (value == null) {
- value = curVal;
- }
+ if (value != null) {
+ returnValue = getFormattedValue(context, calendar, value);
+ }
- return getFormattedValue(context, calendar, value);
+ return returnValue;
}
public void writeSymbols(FacesContext facesContext, UICalendar calendar)
16 years, 2 months