[richfaces-svn-commits] JBoss Rich Faces SVN: r2213 - in trunk/ui/tree/src/main: resources/org/richfaces/renderkit/html/css and 2 other directories.

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

Author: nbelaevski
Date: 2007-08-11 22:20:40 -0400 (Sat, 11 Aug 2007)
New Revision: 2213

Modified:
   trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
   trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
   trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
   trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
Log:
Tree:
- layout fixed in IE
- script legacy code cleaned

Modified: trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java
===================================================================
--- trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java	2007-08-11 23:25:05 UTC (rev 2212)
+++ trunk/ui/tree/src/main/java/org/richfaces/renderkit/TreeRendererBase.java	2007-08-12 02:20:40 UTC (rev 2213)
@@ -144,14 +144,14 @@
 			}
 			
 			getUtils().writeAttribute(writer, "id", context.getClientId() + "childs");
-
+			
 			if (!context.isExpanded()) {
 				getUtils().writeAttribute(writer, "style", "display: none;");
 			}
 			
 			String styleClasses = "";
 			if (context.getRowKey() != null) {
-				styleClasses = "dr-tree-h-ic-div";
+				styleClasses = "dr-tree-layout-on dr-tree-h-ic-div";
 				if (!context.isLast() && showLines) styleClasses += " dr-tree-h-ic-line";
 			}
 			if (styleClasses!="") getUtils().writeAttribute(writer, "class", styleClasses);

Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss	2007-08-11 23:25:05 UTC (rev 2212)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/css/tree.xcss	2007-08-12 02:20:40 UTC (rev 2213)
@@ -7,6 +7,14 @@
 .dr-tree {
 }
 
+.dr-tree-full-width {
+	width: 100%;
+}
+
+.dr-tree-layout-on {
+	zoom: 1;
+}
+
 .dr-tree-h-input {
 	display: none;
 }

Modified: trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js
===================================================================
--- trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js	2007-08-11 23:25:05 UTC (rev 2212)
+++ trunk/ui/tree/src/main/resources/org/richfaces/renderkit/html/scripts/tree.js	2007-08-12 02:20:40 UTC (rev 2213)
@@ -48,8 +48,6 @@
 		this.selectionManager = new Tree.SelectionManager(this);
 		this.selectionManager.restoreSelection();
 
-		//this.correctSizes();
-
 		Event.observe(this.element, "click", function(event) {
 			if (Richfaces.eventIsSynthetic(event)) {
 				var treeItem = event["treeItem"];
@@ -104,10 +102,6 @@
 				}
 			}
 		}.bindAsEventListener(this));
-
-		//this.eventResize = this.correctSizes.bindAsEventListener(this);
-		// commented by nick
-		//IL.Event.observe(this.element, "resizex", this.eventResize);
 	},
 
 	getElements: function() {
@@ -131,36 +125,6 @@
 		}
 	},
 
-	correctSizes: function() {
-		if (!this.options.width) this.options.width = "100%";
-		if (!this.options.height) this.options.height = "100%";
-
-		var parentDim = Element.getDimensions(this.element.parentNode);
-		var dim = {};
-
-		var bc = {width: 0, height: 0};
-
-		/* - commented by nick
-		if (/MSIE/.test(navigator.userAgent)) {
-			bc.width = parseInt(Element.getStyle(this.element, "border-left-width")) + parseInt(Element.getStyle(this.element, "border-right-width"));
-			bc.height = parseInt(Element.getStyle(this.element, "border-top-width")) + parseInt(Element.getStyle(this.element, "border-bottom-width"));
-		}
-		*/
-
-		if (this.options.width.slice(-1) == "%") {
-			dim.width = (parentDim.width * parseInt(this.options.width) / 100);
-		} else {
-			dim.width = parseInt(this.options.width);
-		}
-		if (this.options.height.slice(-1) == "%") {
-			dim.height = (parentDim.height * parseInt(this.options.height) / 100);
-		} else {
-			dim.height = parseInt(this.options.height);
-		}
-
-		Element.setStyle(this.element, {width: (dim.width - bc.width) + "px", height: (dim.height - bc.height) + "px"});
-	},
-
 	addChild: function(child) {
 		this.childs.push(child);
 	},

Modified: trunk/ui/tree/src/main/templates/htmlTreeNode.jspx
===================================================================
--- trunk/ui/tree/src/main/templates/htmlTreeNode.jspx	2007-08-11 23:25:05 UTC (rev 2212)
+++ trunk/ui/tree/src/main/templates/htmlTreeNode.jspx	2007-08-12 02:20:40 UTC (rev 2213)
@@ -31,7 +31,7 @@
 	<f:call name="initializeLines" />
 	<f:call name="initializeResources" />
 
-	<table border="0" cellpadding="0" cellspacing="0" id="#{clientId}" style="width:100%">
+	<table border="0" cellpadding="0" cellspacing="0" id="#{clientId}" class="dr-tree-full-width">
 	<tbody>
 
 	<tr id="#{clientId}:mainRow" onclick="#{component.attributes['onclick']} #{this:getToggleScript(context, component, 'mainRow')}" >