Merge branch 'release-0.3.3'

Author: dmolsen

CHANGELOG

@@ -1,5 +1,11 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.3.3
+ - FIX: links created with {{ link.pattern }} now have the correct path
+ - FIX: links within a pattern now properly update the history
+ - FIX: simplified the history updates from a pattern
+ - THX: thanks to @kevin-heil for the fix for {{ link.pattern }}
+
 PL-v0.3.2
  - ADD: added .svn to the ignore dirs listing when checking the source dir
  - FIX: top-level ignored dirs are now found properly

builder/builder.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder CLI - v0.3.2
+ * Pattern Lab Builder CLI - v0.3.3
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

builder/lib/builder.lib.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.3.2
+ * Pattern Lab Builder Class - v0.3.3
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -301,7 +301,7 @@ protected function gatherData() {
 			foreach($patterns as $pattern => $path) {
 				$patternName = $patternTypeName."-".$pattern;
 				$path = str_replace("/","-",$path);
-				$this->d->link->$patternName = "/patterns/".$path."/".$path.".html";
+				$this->d->link->$patternName = "../../patterns/".$path."/".$path.".html";
 			}
 
 		}

builder/lib/generator.lib.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.3.2
+ * Pattern Lab Generator Class - v0.3.3
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

builder/lib/watcher.lib.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Watcher Class - v0.3.2
+ * Pattern Lab Watcher Class - v0.3.3
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

source/_patternlab-files/pattern-header-footer/footer.html

@@ -21,6 +21,15 @@
 			parent.postMessage( { "bodyclick": "bodyclick" }, targetOrigin)
 		};
 
+		// find all links and add an onclick handler for replacing the iframe address so the history works
+		var aTags = document.getElementsByTagName('a');
+		for (a in aTags) {
+			aTags[a].onclick = function(e) {
+				e.preventDefault();
+				window.location.replace(this.getAttribute("href"));
+			};
+		}
+		
 		// watch the iframe source so that it can be sent back to everyone else.
 		function receiveIframeMessage(event) {
 

source/_patternlab-files/styleguide.mustache

@@ -23,26 +23,28 @@
 </div> <!--end #patterns-->
 </div><!--End Style Guide Main Content-->
 <script>
-
+	
+	// alert the iframe parent that the pattern has loaded. for page follow.
 	if (self != top) {
 		var targetOrigin = (window.location.protocol == "file:") ? "*" : window.location.protocol+"//"+window.location.host;
 		parent.postMessage( { "patternpartial": "all", "path": window.location.toString() }, targetOrigin);
 	}
 	
-	var body = document.getElementsByTagName('body');
+	// if there are clicks on the iframe make sure the nav in the iframe parent closes
+	var body = document.getElementsByTagName("body");
 	body[0].onclick = function() {
 		var targetOrigin = (window.location.protocol == "file:") ? "*" : window.location.protocol+"//"+window.location.host;
 		parent.postMessage( { "bodyclick": "bodyclick" }, targetOrigin)
 	};
 	
-	var els = document.getElementsByClassName("patternLink");
-	for (i in els) {
-		els[i].onclick = function() {
-			if (self != top) {
-				var targetOrigin = (window.location.protocol == "file:") ? "*" : window.location.protocol+"//"+window.location.host;
-				parent.postMessage( { "patternpartial": this.getAttribute("data-patternpartial"), "path": "foo" }, targetOrigin);
-				return false;
-			}
+	// find all links and add an onclick handler for replacing the iframe address so the history works
+	if (self != top) {
+		var aTags = document.getElementsByTagName("a");
+		for (a in aTags) {
+			aTags[a].onclick = function(e) {
+				e.preventDefault();
+				window.location.replace(this.getAttribute("href"));
+			};
 		}
 	}
 	

source/_patternlab-files/viewall.mustache

@@ -31,20 +31,21 @@
 		parent.postMessage( { "patternpartial": "{{ patternPartial }}", "path": window.location.toString() }, targetOrigin);
 	}
 	
+	// if there are clicks on the iframe make sure the nav in the iframe parent closes
 	var body = document.getElementsByTagName('body');
 	body[0].onclick = function() {
 		var targetOrigin = (window.location.protocol == "file:") ? "*" : window.location.protocol+"//"+window.location.host;
 		parent.postMessage( { "bodyclick":"bodyclick" }, targetOrigin)
 	};
 	
-	var els = document.getElementsByClassName("patternLink");
-	for (i in els) {
-		els[i].onclick = function() {
-			if (self != top) {
-				var targetOrigin = (window.location.protocol == "file:") ? "*" : window.location.protocol+"//"+window.location.host;
-				parent.postMessage( { "patternpartial": this.getAttribute("data-patternpartial"), "path": "foo" }, targetOrigin);
-				return false;
-			}
+	// find all links and add an onclick handler for replacing the iframe address so the history works
+	if (self != top) {
+		var aTags = document.getElementsByTagName('a');
+		for (a in aTags) {
+			aTags[a].onclick = function(e) {
+				e.preventDefault();
+				window.location.replace(this.getAttribute("href"));
+			};
 		}
 	}