[richfaces-svn-commits] JBoss Rich Faces SVN: r12444 - in trunk/test-applications/realworld/web/src/main: webapp/WEB-INF/tags/templates and 1 other directory.

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

Author: andrei_exadel
Date: 2009-01-27 13:40:17 -0500 (Tue, 27 Jan 2009)
New Revision: 12444

Modified:
   trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/modalpanel/AlbumPopupHelper.java
   trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/album.xhtml
Log:
Fix validation inside modal panel

Modified: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/modalpanel/AlbumPopupHelper.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/modalpanel/AlbumPopupHelper.java	2009-01-27 18:23:01 UTC (rev 12443)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/modalpanel/AlbumPopupHelper.java	2009-01-27 18:40:17 UTC (rev 12444)
@@ -22,8 +22,11 @@
 
 import java.io.Serializable;
 
+import javax.faces.context.FacesContext;
 import javax.faces.event.ActionEvent;
 
+import org.ajax4jsf.context.AjaxContext;
+import org.ajax4jsf.javascript.JSLiteral;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
@@ -37,11 +40,13 @@
 public class AlbumPopupHelper implements Serializable{
 
 	private static final long serialVersionUID = 2561824019376412988L;
-
+	
 	private String caption;
 	
 	private String actionName;
 	
+	private String oncomplete = ";";
+	
 	@In(create=true, required=true) @Out
 	private Album album;
 	
@@ -53,6 +58,7 @@
 	public void initAlbumData( String actionName, String caption, Album album){
 		this.caption = caption;
 		this.actionName = actionName;
+		this.oncomplete = ";";
 		if(null != album){
 			this.album = album;
 			this.parent = album.getParent();
@@ -65,6 +71,7 @@
 	public void initAlbumData( String actionName, String caption, Album album, Album parent){
 		this.caption = caption;
 		this.actionName = actionName;
+		this.oncomplete = ";";
 		if(null != album){
 			this.album = album;
 		}else{
@@ -75,8 +82,18 @@
 	
 	public void editAlbum(ActionEvent event){
 		albumManager.editAlbum(this.album);
+		setOncomplete();
 	}
 	
+	private void setOncomplete() {
+		oncomplete = "$('albumModalPanel').component.hide()";
+//		FacesContext context = FacesContext.getCurrentInstance();
+//		AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
+//		if (ajaxContext.isAjaxRequest()) {
+//			ajaxContext.setOncomplete(new JSLiteral("$('albumModalPanel').component.hide()"));
+//		}
+	}
+	
 	public String getCaption() {
 		return caption;
 	}
@@ -105,4 +122,15 @@
 	public void setParent(Album parent) {
 		this.parent = parent;
 	}
+
+	public String getOncomplete() {
+		return oncomplete;
+	}
+
+	public void setOncomplete(String oncomplete) {
+		this.oncomplete = oncomplete;
+	}
+
+	
+	
 }

Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/album.xhtml
===================================================================
(Binary files differ)