[richfaces-svn-commits] JBoss Rich Faces SVN: r14663 - in branches/community/3.3.X: cdk/generator/src/main/resources/META-INF/templates12 and 2 other directories.

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

Author: amarkhel
Date: 2009-06-19 15:17:57 -0400 (Fri, 19 Jun 2009)
New Revision: 14663

Modified:
   branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/taglib.vm
   branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm
   branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
   branches/community/3.3.X/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
Log:


Modified: branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/taglib.vm
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/taglib.vm	2009-06-19 17:56:05 UTC (rev 14662)
+++ branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates/taglib.vm	2009-06-19 19:17:57 UTC (rev 14663)
@@ -4,15 +4,14 @@
 <taglib>
  <tlib-version>${taglib.tlibversion}</tlib-version>
  <jsp-version>${taglib.jspversion}</jsp-version>
+#if(${taglib.description})
+ <description>${taglib.description}</description>
+#end
 #if(${taglib.shortname})
  <short-name>${taglib.shortname}</short-name>
 #end
  <uri>${taglib.uri}</uri>
-#if(${taglib.description})
- <description>${taglib.description}</description>
-#end
 ${taglib.includeContent}
-
 #foreach( $component in ${components})
 	#if($component.tag)
  <tag>

Modified: branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm
===================================================================
--- branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm	2009-06-19 17:56:05 UTC (rev 14662)
+++ branches/community/3.3.X/cdk/generator/src/main/resources/META-INF/templates12/taglib.vm	2009-06-19 19:17:57 UTC (rev 14663)
@@ -76,13 +76,14 @@
     version="${taglib.jspversion}">
  <tlib-version>${taglib.tlibversion}</tlib-version>
 ## <jsp-version>${taglib.jspversion}</jsp-version>
+#if(${taglib.description})
+ <description>${taglib.description}</description>
+#end
+
 #if(${taglib.shortname})
  <short-name>${taglib.shortname}</short-name>
 #end
  <uri>${taglib.uri}</uri>
-#if(${taglib.description})
- <description>${taglib.description}</description>
-#end
 
 ${taglib.includeContent}
 

Modified: branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java
===================================================================
--- branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java	2009-06-19 17:56:05 UTC (rev 14662)
+++ branches/community/3.3.X/ui/layout/src/main/java/org/richfaces/renderkit/AbstractPageRenderer.java	2009-06-19 19:17:57 UTC (rev 14663)
@@ -174,7 +174,8 @@
 			StringBuilder format = new StringBuilder(
 					".rich-page{margin:auto;text-align:left;");
 			format.append("width:").append(nonIeWidth).append("em;");
-			format.append("*width:").append(ieWidth).append("em;}\n");
+			format.append("*width:").append(ieWidth).append("em;\n");
+			format.append("}\n");
 			writer.write(format.toString());
 		} else {
 			writer.write(".rich-page{margin:auto 10px;width:auto;}\n");

Modified: branches/community/3.3.X/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
===================================================================
--- branches/community/3.3.X/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js	2009-06-19 17:56:05 UTC (rev 14662)
+++ branches/community/3.3.X/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js	2009-06-19 19:17:57 UTC (rev 14663)
@@ -480,14 +480,21 @@
 		var horizontalDirection = match[2];
 		var verticalDirection = match[1];
 
-		var coords = this.fitToolTip(e.clientX, e.clientY, elementDim, horizontalDirection, verticalDirection, 
+		var clientX = isNaN(e.clientX) ? Element.cumulativeOffset(this.parent).left + this.toolTip.horizontalOffset : e.clientX;
+		var clientY = isNaN(e.clientY) ?  Element.cumulativeOffset(this.parent).top + this.toolTip.verticalOffset : e.clientY;
+		var coords = this.fitToolTip(clientX, clientY, elementDim, horizontalDirection, verticalDirection, 
 				{'x':this.horizontalOffset, 'y':this.verticalOffset});
 		
 	    var offsets = jQuery(this.toolTip).offset();
-
-		var x = coords.x - offsets.left + (event.pageX - event.clientX) + oldLeft;
-		var y = coords.y - offsets.top + (event.pageY - event.clientY) + oldTop;
-		
+	    var x;
+	    var y;
+		if(isNaN(event.clientX)){
+			x = coords.x - offsets.left + oldLeft + this.toolTip.horizontalOffset;
+			y = coords.y - offsets.top + oldTop + this.toolTip.verticalOffset;
+		}else{
+			x = coords.x - offsets.left + (event.pageX - event.clientX) + oldLeft;
+			y = coords.y - offsets.top + (event.pageY - event.clientY) + oldTop;
+		}
 	    Element.setStyle(this.toolTip, {"left": x + "px", "top": y + "px"});
 		if(this.iframe)
 		{