[richfaces-svn-commits] JBoss Rich Faces SVN: r6175 - in trunk/sandbox/ui/fileUpload/src/main: templates/org/richfaces and 1 other directory.

[richfaces-svn-commits at lists.jboss.org]

Author: andrei_exadel
Date: 2008-02-19 12:03:45 -0500 (Tue, 19 Feb 2008)
New Revision: 6175

Modified:
   trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
   trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
Log:


Modified: trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java	2008-02-19 16:34:21 UTC (rev 6174)
+++ trunk/sandbox/ui/fileUpload/src/main/java/org/richfaces/org/jboss/seam/ui/renderkit/FileUploadRendererBase.java	2008-02-19 17:03:45 UTC (rev 6175)
@@ -19,11 +19,14 @@
 import org.ajax4jsf.javascript.JSFunctionDefinition;
 import org.ajax4jsf.javascript.JSReference;
 import org.ajax4jsf.renderkit.AjaxRendererUtils;
+import org.ajax4jsf.renderkit.RendererUtils;
 import org.richfaces.component.UIProgressBar;
 import org.richfaces.org.jboss.seam.ui.component.UIFileUpload;
 import org.richfaces.org.jboss.seam.web.MultipartRequest;
 import org.richfaces.renderkit.TemplateEncoderRendererBase;
 
+import com.sun.faces.context.FacesContextImpl;
+
 /**
  * Class provides base renderer for upload file component
  * 
@@ -55,10 +58,16 @@
 	UIFileUpload fileUpload = (UIFileUpload) component;
 	ServletRequest request = (ServletRequest) context.getExternalContext()
 		.getRequest();
+	
 
 	String clientId = component.getClientId(context);
-//	Map<String, String[]> params = context.getExternalContext()
-//		.getRequestParameterValuesMap();
+	Map<String, String[]> params = context.getExternalContext()
+		.getRequestParameterValuesMap();
+	
+	if (params.containsKey("percent")) {
+	    AjaxContext ajaxContext = AjaxContextImpl.getCurrentInstance(context);
+	    ajaxContext.setResponseData("safasfas");
+	}
 //
 //	AjaxContext ajaxContext = AjaxContextImpl.getCurrentInstance(context);
 
@@ -70,7 +79,7 @@
 
 	if (request instanceof MultipartRequest) {
 	    MultipartRequest multipartRequest = (MultipartRequest) request;
-	    clientId = clientId + ":1";
+	    clientId = clientId + ":file";
 	    fileUpload.setLocalInputStream(multipartRequest
 		    .getFileInputStream(clientId));
 	    fileUpload.setLocalContentType(multipartRequest
@@ -79,7 +88,6 @@
 	    fileUpload.setLocalFileSize(multipartRequest.getFileSize(clientId));
 	    onUploadComplete(context, multipartRequest.getFile(clientId),
 		    fileUpload);
-
 	}
 
     }
@@ -94,7 +102,6 @@
 		map.isEmpty();
 	    }
 	}
-
     }
 
     private void onUploadComplete(FacesContext context, File file,

Modified: trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx
===================================================================
--- trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx	2008-02-19 16:34:21 UTC (rev 6174)
+++ trunk/sandbox/ui/fileUpload/src/main/templates/org/richfaces/fileUpload.jspx	2008-02-19 17:03:45 UTC (rev 6175)
@@ -25,7 +25,6 @@
 <div class="upload_list_width upload_list_decor" id="#{clientId}">
 
 <iframe name="#{clientId}" id="#{clientId}_iframe" style="display: none;"/>
-
 	
 <span style="display: none;">
 	<jsp:scriptlet>
@@ -34,7 +33,6 @@
 		  ]]>
 	</jsp:scriptlet>
 </span>
-
 	<table class="upload_toolbar_decor">
 		<tr>
 			<td>
@@ -47,7 +45,7 @@
 						<input type="file" style="cursor: pointer; z-index: 3; right: -10px; top: -10px; font-size: 10em; position: absolute" 
 							   class="hidden"
 							   id="#{clientId}:file"
-							   name="fileName"
+							   name="#{clientId}:file"
 							   onchange="return $('#{clientId}').component.add(this);"/>
 					</div>
 				</div>
@@ -98,7 +96,7 @@
 			</td>
 		</tr>
 	</table>
-
+	
 	<div class="upload_list_width upload_list_overflow" id="#{clientId}:fileItems">
 	
 	</div>