Added 'open in new window or tab' option

jerone · jerone · commit 045e7396c0ac · 2012-05-24T00:08:26.000Z
diff --git a/TODO.txt b/TODO.txt
@@ -1,9 +1,11 @@
 TODO:
+	FIX: Documentation (http://www.jeroenvanwarmerdam.nl/content/resources/javascript/jscumulus/jscumulus.aspx);
+	FIX: Convert to canvas (http://www.goat1000.com/tagcanvas.php);
 	ADD: Mouse panning, zooming;
-	ADD: Documentation;
 	ADD: Z-sorting;
 	ADD: Slow down more on tag mouse focus;
 	ADD: Calculating the color instead using the Opacity property;
 	ADD: Touch events;
 	ADD: Always on;
-	ADD: Specify beginning origin; 
+	ADD: Specify beginning origin;
+	ADD: Tags from xml;
diff --git a/index.html b/index.html
@@ -3,16 +3,17 @@
 <head>
 	<title>JS-Cumulus => WP-Cumulus in Javascript</title>
 
-	<script type="text/javascript" src="js-cumulus.min.js"></script>
+	<script type="text/javascript" src="js-cumulus.js"></script>
 
 	<script type="text/javascript">
 		//JSCumulus.noConflict();
 
-		/* TagCloud 1 */
 		/* DEBUG */ window.console && console.time && console.time("TagCloud1");
+		
+		/* TagCloud 1 */
 		var tags = [
 			new Tag("JS-Cumulus", 100),
-			new Tag("WP-Cumulus", 80, "http://www.roytanck.com/2008/05/19/how-to-repurpose-my-tag-cloud-flash-movie/"),
+			new Tag("WP-Cumulus", 80, "http://www.roytanck.com/2008/05/19/how-to-repurpose-my-tag-cloud-flash-movie/", true),
 			new Tag("Jeroen van Warmerdam", 60, "http://www.jeroenvanwarmerdam.nl"),
 			new Tag("Stratus", "http://student.agh.edu.pl/~fatyga/repos/stratus/example.php"),
 			new Tag("JavaScript", {
@@ -32,6 +33,7 @@
 			new Tag("<img src='icon-tagcloud.gif' />")
 		];
 		var tagCloud1 = new TagCloud(tags, 400, 400);
+		
 		/* DEBUG */ window.console && console.time && console.timeEnd("TagCloud1");
 	</script>
 
@@ -134,8 +136,9 @@ <h4>Tag Cloud <small id="TagCloud2X_fps" /></h4>
 	</div>
 
 	<script type="text/javascript">
-		/* TagCloud 2 */
 		/* DEBUG */ window.console && console.time && console.time("TagCloud2");
+		
+		/* TagCloud 2 */
 		var tags2 = [
 			new Tag("JS-Cumulus", 100),
 			new Tag("WP-Cumulus", 80, "http://www.roytanck.com/2008/05/19/how-to-repurpose-my-tag-cloud-flash-movie/"),
@@ -163,6 +166,7 @@ <h4>Tag Cloud <small id="TagCloud2X_fps" /></h4>
 			{ overwrite: true, id: "TagCloud2X" }
 		);
 		tagCloud2.Animate();
+		
 		/* DEBUG */ window.console && console.time && console.timeEnd("TagCloud2");
 
 
diff --git a/js-cumulus.js b/js-cumulus.js
@@ -68,6 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 		Consistent : true,       // Boolean       => Devide tags evenly;
 		Rank : 30,               // Integer 0-100 => Tag importance in procents;
 		Url : "#",               // String URL    => Tag url;
+		OpenInNewWindow: false,  // Boolean       => Open tag url in new window or tab;
 		FontMin : 10,            // Float         => Font size for smallest tag in pixels;
 		FontMax : 24,            // Float         => Font size for biggest tag in pixels;
 		Depth : 150,             // Integer       => Perspective depth;
@@ -273,18 +274,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	};
 
 	/** Tag Class **/
-	var Tag = function(title, rank, url, styles){
+	var Tag = function(title, rank, url, openInNewWindow, styles){
 		this.id = _TagID++;
 		this.title = title;
 		this.rank = ((!isNaN(rank) && rank >= 0 && rank <= 100) ? rank : Defaults.Rank) / 100;
 		this.url = url || (isNaN(rank) ? rank : false) || Defaults.Url;
 		this.position = new Vector();
 
-		styles = styles || isObject(url) && url || isObject(rank) && rank || { };
+		openInNewWindow = arguments[4] && openInNewWindow || (openInNewWindow===true ? true : false) || (arguments[2]===true ? true : false) || Defaults.OpenInNewWindow;
+		styles = styles || isObject(arguments[3]) && arguments[3] || isObject(arguments[2]) && arguments[2] || isObject(arguments[1]) && arguments[1] || {};
 
 		var aa = _doc.createElement("a");
 		aa.setAttribute("id", "jsCumulus" + this.id);
 		aa.setAttribute("href", this.url);
+		if(openInNewWindow){
+			aa.setAttribute("target", "_blank");
+		}
 		aa.innerHTML = this.title;
 		for(var style in styles){
 			aa.style[style] = styles[style];
