X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=build%2Fdocs%2Fjs%2Fdoc.js;h=b0d698992f021effccaf740f2868cd9427d27e16;hb=b5bf00a37368baf69595434c0329f869b9ca18e9;hp=4c607fe502c45cd00bcf39d4635afffb3c88ac6f;hpb=bb816b9c95b3ad8c6335588b4f232599d5838bd6;p=jquery.git

diff --git a/build/docs/js/doc.js b/build/docs/js/doc.js
index 4c607fe..b0d6989 100644
--- a/build/docs/js/doc.js
+++ b/build/docs/js/doc.js
@@ -4,7 +4,7 @@ var types = {
 	String: "A string of characters.",
 	Number: "A numeric valid.",
 	Element: "The Javascript object representation of a DOM Element.",
-	Hash: "A Javascript object that contains key/value pairs in the form of properties and values.",
+	Map: "A Javascript object that contains key/value pairs in the form of properties and values.",
 	"Array<Element>": "An Array of DOM Elements.",
 	"Array<String>": "An Array of strings.",
 	Function: "A reference to a Javascript function.",
@@ -13,10 +13,19 @@ var types = {
 };
 
 $(document).ready(function(){
-	$("span.tooltip").each(function(){
-		if ( types[ this.innerHTML ] )
+	var tooltips = $("span.tooltip").each(function() {
+		var type = this.innerHTML;
+		if( type.indexOf("|") != -1 ) {
+			var $this = $(this).empty();
+			$.each(type.split("\|"), function(i, n) {
+				var title = types[n] && " title=\"" + types[n] + "\"" || "";
+				var pipe = i != 0 ? "|" : "";
+				$this.append( pipe + "<span class=\"tooltip\" " + title + ">" + n + "</span>" );
+			});
+		} else if ( types[ this.innerHTML ] )
 			this.title = types[ this.innerHTML ];
-	}).ToolTipDemo('#fff');
+	})
+	tooltips.add($("span.tooltip", tooltips)).ToolTipDemo('#fff');
 
 	$("a.name").click(function(){
 		$("div.more,div.short",this.parentNode.parentNode).toggle();