[jboss-svn-commits] JBL Code SVN: r6026 - in labs/jbosslabs/trunk/portal-extensions/portal-dnd: dndRenderer.war/js/portal src/java/org/jboss/portal/core/theme/render/impl

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

Author: szimano
Date: 2006-08-30 11:42:25 -0400 (Wed, 30 Aug 2006)
New Revision: 6026

Modified:
   labs/jbosslabs/trunk/portal-extensions/portal-dnd/dndRenderer.war/js/portal/PortalDD.js
   labs/jbosslabs/trunk/portal-extensions/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDRegionRenderer.java
   labs/jbosslabs/trunk/portal-extensions/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDTools.java
Log:
again border problem JBLAB-728

Modified: labs/jbosslabs/trunk/portal-extensions/portal-dnd/dndRenderer.war/js/portal/PortalDD.js
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-dnd/dndRenderer.war/js/portal/PortalDD.js	2006-08-30 15:33:59 UTC (rev 6025)
+++ labs/jbosslabs/trunk/portal-extensions/portal-dnd/dndRenderer.war/js/portal/PortalDD.js	2006-08-30 15:42:25 UTC (rev 6026)
@@ -4,6 +4,8 @@
 var borderTopBefore = "";
 var ajaxEnabled = true;
 
+var borderSet = false;
+
 var ajaxURI = "/dndRenderer/ajax";
 
 var host = "";
@@ -17,12 +19,14 @@
 	YAHOO.util.Dom.setStyle(id, "border", borderBefore);
     borderBefore = "";
     borderTopBefore = "";
+    borderSet = false;
 }
 
 function setBorder(id) {
-	if (borderBefore && borderBefore.length == 0) {
+	if (!borderSet) {
     	borderTopBefore = YAHOO.util.Dom.getStyle(id, "border-top");
     	borderBefore = YAHOO.util.Dom.getStyle(id, "border");
+    	borderSet = true;
     }
     
     YAHOO.util.Dom.setStyle(id, "border-top", "2px solid red");
@@ -124,7 +128,7 @@
 	
 	var nodeList = dropedParent.childNodes;
 	
-	var adding = false;
+	var adding = false;YAHOO.util.PortalDD
 	
 	// move down all the nodes under the portlet (including dropto portlet)
 	var i = 0;
@@ -173,4 +177,25 @@
     DOM.setStyle(del, "visibility", "hidden"); 
     //lel.style.visibility = "";
     //DOM.setStyle(lel, "visibility", ""); 
-};
\ No newline at end of file
+};
+
+// cleans up regionDD renderer from some crap wrongly intepreted by a browser
+function cleanUpDocument(id) {
+	var region = document.getElementById(id);
+	var nodeList = region.childNodes;
+	
+	// move down all the nodes under the portlet (including dropto portlet)
+	var i = 0;
+	while (i < nodeList.length) {
+		var nextNode = nodeList.item(i);
+		
+		//log.log(nextNode);
+		if (nextNode instanceof Text) {
+			//log.log("next one: "+id+" "+ i);
+			region.removeChild(nextNode);
+		}
+		else {
+			i++;
+		}
+	}
+}
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDRegionRenderer.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDRegionRenderer.java	2006-08-30 15:33:59 UTC (rev 6025)
+++ labs/jbosslabs/trunk/portal-extensions/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDRegionRenderer.java	2006-08-30 15:42:25 UTC (rev 6026)
@@ -162,11 +162,14 @@
 			renderContext.getMarkupFragment().append(
 					"YAHOO.util.Event.addListener(window, 'load', YAHOO.example.DDApp"
 							+ renderContext.getRegionID() + ".init);\n");
+			renderContext.getMarkupFragment().append(
+					"YAHOO.util.Event.addListener(window, 'load', cleanUpDocument(\"regionDD" + renderContext.getRegionID()  +"\"));\n");
+					
+			
 			renderContext.getMarkupFragment().append("</script>\n\n");
 
 			portletNumbers.put(renderContext.getRegionID(), 0);
 		}
-
 	}
 
 	/**

Modified: labs/jbosslabs/trunk/portal-extensions/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDTools.java	2006-08-30 15:33:59 UTC (rev 6025)
+++ labs/jbosslabs/trunk/portal-extensions/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDTools.java	2006-08-30 15:42:25 UTC (rev 6026)
@@ -27,7 +27,7 @@
 			+ "<script type='text/javascript' src='/dndRenderer/js/portal/PortalDD.js' ></script>\n\n\n"
 			// comment out everything under this if you don't wanna have the logger
 			
-			+ "<script type='text/javascript'>"
+			/*+ "<script type='text/javascript'>"
 			+ "var myLogReader1 = new YAHOO.widget.LogReader(null, { newestOnTop: true, height: \"400px\" });"
 			+ "</script>\n\n"
 			
@@ -48,7 +48,7 @@
 			+ ".yui-log .error {background-color:#E32F0B;} \n"
 			+ ".yui-log .time {background-color:#A6C9D7;} \n"
 			+ ".yui-log .window {background-color:#F2E886;} \n"
-			+ "</style>\n\n";
+			+ "</style>\n\n"*/;
 
 	public static Class getRendererClass(String className) throws ClassNotFoundException{
 		Properties props = new Properties();