[jboss-svn-commits] JBoss Portal SVN: r5152 - in branches/tomek/portal-dnd: dndRenderer.war/js/dragdrop dndRenderer.war/js/portal src/java/org/jboss/portal/core/theme/render/impl

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

Author: roy.russo at jboss.com
Date: 2006-09-05 15:27:37 -0400 (Tue, 05 Sep 2006)
New Revision: 5152

Modified:
   branches/tomek/portal-dnd/dndRenderer.war/js/dragdrop/dragdrop-debug.js
   branches/tomek/portal-dnd/dndRenderer.war/js/portal/PortalDD.js
   branches/tomek/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDTools.java
Log:
- fixed IE bug: in PortalDD.cleanUpDocument(id)... Text type is undefined so its now commented out.
- fixed IE bug: in PortalDD.getBorder. IE border class was missing, now explicitly setting border when not found.
- Reset client-side logging

Modified: branches/tomek/portal-dnd/dndRenderer.war/js/dragdrop/dragdrop-debug.js
===================================================================
--- branches/tomek/portal-dnd/dndRenderer.war/js/dragdrop/dragdrop-debug.js	2006-09-05 16:01:06 UTC (rev 5151)
+++ branches/tomek/portal-dnd/dndRenderer.war/js/dragdrop/dragdrop-debug.js	2006-09-05 19:27:37 UTC (rev 5152)
@@ -1198,19 +1198,18 @@
          * @private
          */
         this._onLoad = function() {
-
             this.init();
 
             this.logger.log("DDM onload");
-
             var EU = YAHOO.util.Event;
 
             EU.on(document, "mouseup",   this.handleMouseUp, this, true);
             EU.on(document, "mousemove", this.handleMouseMove, this, true);
             EU.on(window,   "unload",    this._onUnload, this, true);
             EU.on(window,   "resize",    this._onResize, this, true);
-            // EU.on(window,   "mouseout",    this._test);
+            EU.on(window,   "mouseout",    this._test);
 
+            this.logger.log("DDM loaded");
         };
 
         /**

Modified: branches/tomek/portal-dnd/dndRenderer.war/js/portal/PortalDD.js
===================================================================
--- branches/tomek/portal-dnd/dndRenderer.war/js/portal/PortalDD.js	2006-09-05 16:01:06 UTC (rev 5151)
+++ branches/tomek/portal-dnd/dndRenderer.war/js/portal/PortalDD.js	2006-09-05 19:27:37 UTC (rev 5152)
@@ -15,8 +15,13 @@
 }
 
 function getBorder(id) {
-	YAHOO.util.Dom.setStyle(id, "border-top", borderTopBefore);
-	YAHOO.util.Dom.setStyle(id, "border", borderBefore);
+    log.log("getBorder...", "info");	
+    if (!borderSet) {
+      setBorder(id);
+    }
+
+	YAHOO.util.Dom.setStyle(id, "border-top", "2px solid red");
+	YAHOO.util.Dom.setStyle(id, "border", "");
     borderBefore = "";
     borderTopBefore = "";
     borderSet = false;
@@ -92,6 +97,7 @@
 }
 
 YAHOO.util.PortalDD.prototype.onDragDrop = function(e, id) {
+    log.log("in PortalDD onDragDrop", "info");
     
     // remove the border around dropto portlet
     getBorder(id);
@@ -101,7 +107,7 @@
 	
 	var thisParent = el.parentNode;
 	var dropedParent = droped.parentNode;
-	
+
 	// show region droper if needed
 	if (thisParent.childNodes.length == 2) {
 		var regToDrop = document.getElementById(thisParent.dropToRegion);
@@ -109,7 +115,7 @@
 		YAHOO.util.Dom.setStyle(regToDrop, "display", "block");
 		YAHOO.util.Dom.setStyle(regToDrop, "visibility", "");
 	}
-	
+    
 	thisParent.removeChild(el);
 	dropedParent.appendChild(el);
 	
@@ -120,7 +126,6 @@
 		YAHOO.util.Dom.setStyle(regToDrop, "display", "none");
 		YAHOO.util.Dom.setStyle(regToDrop, "visibility", "hidden");
 	} 
-	
 	log.log("AFTER Parent: " + el.parentNode + "(" + el.parentNode.id +")"+" droped: " + droped.parentNode + "(" + droped.parentNode.id +")");
 	
 	log.log( "position: " + YAHOO.util.Dom.getStyle(el, "position"));
@@ -183,19 +188,20 @@
 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);
+		log.log(nextNode, "warn");
 		if (nextNode instanceof Text) {
-			//log.log("next one: "+id+" "+ i);
+			log.log("next one: "+id+" "+ i);
 			region.removeChild(nextNode);
 		}
 		else {
 			i++;
 		}
 	}
-}
\ No newline at end of file
+*/
+}

Modified: branches/tomek/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDTools.java
===================================================================
--- branches/tomek/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDTools.java	2006-09-05 16:01:06 UTC (rev 5151)
+++ branches/tomek/portal-dnd/src/java/org/jboss/portal/core/theme/render/impl/DnDTools.java	2006-09-05 19:27:37 UTC (rev 5152)
@@ -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"