[Wicket-stuff-autocvs] wicket-contrib-dojo/src/main/java/wicket/contrib/dojo/DojoFX FXOnClickWiper.java,1.1,1.2

[Marco v. de h. <mar...@us...>]

Update of /cvsroot/wicket-stuff/wicket-contrib-dojo/src/main/java/wicket/contrib/dojo/DojoFX
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22616/src/main/java/wicket/contrib/dojo/DojoFX

Modified Files:
	FXOnClickWiper.java 
Log Message:
fixed wiper so that more then 1 wiper can operate on a page wihout conflicting with eachother

Index: FXOnClickWiper.java
===================================================================
RCS file: /cvsroot/wicket-stuff/wicket-contrib-dojo/src/main/java/wicket/contrib/dojo/DojoFX/FXOnClickWiper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FXOnClickWiper.java	26 Oct 2005 09:47:45 -0000	1.1
--- FXOnClickWiper.java	26 Oct 2005 13:45:47 -0000	1.2
***************
*** 32,35 ****
--- 32,37 ----
  	 */
  	private final boolean startDisplay;
+ 	private String HTMLID;
+ 	private String componentId;
  	
  	/**
***************
*** 63,66 ****
--- 65,74 ----
  	 */
  	public final void renderHeadContribution(HtmlHeaderContainer container)
+ 	/*
+ 	 * TODO: make this part a lot more efficient!
+ 	 * every new Wiper adds a lot of javascript to the header.
+ 	 * I'm positive that this can work a lot more efficient, but have not secceeded
+ 	 * in doing this yet.....
+ 	 */
  	{
  		String s;
***************
*** 70,87 ****
  
  				"\t<script language=\"JavaScript\" type=\"text/javascript\">\n" +
! 				"\twipedOut = 0; \n" + 
! 				"\twiping = 0; \n" +
! 				"\tfunction wipe(id, duration) { \n" +
! 				"\t\tif(wiping==0){\n"+
  				"\t\t\tnode = document.getElementById(id);\n" +
! 				"\t\t\tif(wipedOut == 1) \n" + 
  				"\t\t\t{ \n" +
! 				"\t\t\t\twiping = 1;\n" +
! 				"\t\t\t\twipedOut = 0;\n" +
! 				"\t\t\t\tdojo.fx.html.wipeIn(node, duration, function(){wiping=0});\n" +
  				"\t\t\t} else {\n" +
! 				"\t\t\t\twiping = 1;\n" +
! 				"\t\t\t\twipedOut = 1;\n" +
! 				"\t\t\t\tdojo.fx.html.wipeOut(node, duration, function(){wiping=0});\n" +
  				"\t\t\t}\n" +
  				"\t\t}\n"+
--- 78,95 ----
  
  				"\t<script language=\"JavaScript\" type=\"text/javascript\">\n" +
! 				"\t"+ componentId  + "_wipedOut = 0; \n" + 
! 				"\t"+ componentId  + "_wiping = 0; \n" +
! 				"\tfunction "+ componentId  + "_wipe(id, duration) { \n" +
! 				"\t\tif("+ componentId  + "_wiping==0){\n"+
  				"\t\t\tnode = document.getElementById(id);\n" +
! 				"\t\t\tif("+ componentId  + "_wipedOut == 1) \n" + 
  				"\t\t\t{ \n" +
! 				"\t\t\t\t"+ componentId  + "_wiping = 1;\n" +
! 				"\t\t\t\t"+ componentId  + "_wipedOut = 0;\n" +
! 				"\t\t\t\tdojo.fx.html.wipeIn(node, duration, function(){"+ HTMLID  + "_wiping=0});\n" +
  				"\t\t\t} else {\n" +
! 				"\t\t\t\t"+ componentId  + "_wiping = 1;\n" +
! 				"\t\t\t\t"+ componentId  + "_wipedOut = 1;\n" +
! 				"\t\t\t\tdojo.fx.html.wipeOut(node, duration, function(){"+ HTMLID  + "_wiping=0});\n" +
  				"\t\t\t}\n" +
  				"\t\t}\n"+
***************
*** 92,109 ****
  
  				"\t<script language=\"JavaScript\" type=\"text/javascript\">\n" +
! 				"\twipedOut = 1; \n" + 
! 				"\twiping = 0; \n" +
! 				"\tfunction wipe(id, duration) { \n" +
! 				"\t\tif(wiping==0){\n"+
  				"\t\t\tnode = document.getElementById(id);\n" +
! 				"\t\t\tif(wipedOut == 1) \n" + 
  				"\t\t\t{ \n" +
! 				"\t\t\t\twiping = 1;\n" +
! 				"\t\t\t\twipedOut = 0;\n" +
! 				"\t\t\t\tdojo.fx.html.wipeIn(node, duration, function(){wiping=0});\n" +
  				"\t\t\t} else {\n" +
! 				"\t\t\t\twiping = 1;\n" +
! 				"\t\t\t\twipedOut = 1;\n" +
! 				"\t\t\t\tdojo.fx.html.wipeOut(node, duration, function(){wiping=0});\n" +
  				"\t\t\t}\n" +
  				"\t\t}\n"+
--- 100,117 ----
  
  				"\t<script language=\"JavaScript\" type=\"text/javascript\">\n" +
! 				"\t"+ componentId  + "_wipedOut = 1; \n" + 
! 				"\t"+ componentId  + "_wiping = 0; \n" +
! 				"\tfunction "+ componentId  + "_wipe(id, duration) { \n" +
! 				"\t\tif("+ componentId  + "_wiping==0){\n"+
  				"\t\t\tnode = document.getElementById(id);\n" +
! 				"\t\t\tif("+ componentId  + "_wipedOut == 1) \n" + 
  				"\t\t\t{ \n" +
! 				"\t\t\t\t"+ componentId  + "_wiping = 1;\n" +
! 				"\t\t\t\t"+ componentId  + "_wipedOut = 0;\n" +
! 				"\t\t\t\tdojo.fx.html.wipeIn(node, duration, function(){"+ componentId  + "_wiping=0});\n" +
  				"\t\t\t} else {\n" +
! 				"\t\t\t\t"+ componentId  + "_wiping = 1;\n" +
! 				"\t\t\t\t"+ componentId  + "_wipedOut = 1;\n" +
! 				"\t\t\t\tdojo.fx.html.wipeOut(node, duration, function(){"+ componentId  + "_wiping=0});\n" +
  				"\t\t\t}\n" +
  				"\t\t}\n"+
***************
*** 137,143 ****
  		Component c = getComponent();
  		this.component = (Component)c;
  		
  		//create a unique HTML for the wipe component
! 		String HTMLID = this.component.getId() + "_" + component.getPath();
  		//Add ID to component, and bind effect to trigger
  		this.component.add(new AttributeModifier("id", true, new Model(HTMLID)));
--- 145,152 ----
  		Component c = getComponent();
  		this.component = (Component)c;
+ 		this.componentId = c.getId();
  		
  		//create a unique HTML for the wipe component
! 		HTMLID = this.component.getId() + "_" + component.getPath();
  		//Add ID to component, and bind effect to trigger
  		this.component.add(new AttributeModifier("id", true, new Model(HTMLID)));
***************
*** 146,150 ****
  			this.component.add(new AppendAttributeModifier("style", true, new Model("display:none")));
  		}
! 		this.getTrigger().add(new AppendAttributeModifier(getEventName(),true, new Model("wipe('"+ HTMLID +"', 1400);")));
  		
  	}
--- 155,159 ----
  			this.component.add(new AppendAttributeModifier("style", true, new Model("display:none")));
  		}
! 		this.getTrigger().add(new AppendAttributeModifier(getEventName(),true, new Model(componentId + "_wipe('"+ HTMLID +"', " + getDuration() + ");")));
  		
  	}