fixing bug with viewall pages and history

Author: dmolsen

builder/lib/builder.lib.php

@@ -214,6 +214,7 @@ protected function generateViewAllPages() {
 
 								// get all the rendered partials that match
 								$sid = $this->gatherPartialsByMatch($patternType, $patternSubType);
+								$sid["patternPartial"] = $subItem["patternPartial"];
 
 								// render the viewall template
 								$v = $this->mfs->render('viewall',$sid);

public/styleguide/js/styleguide.js

@@ -503,7 +503,6 @@ function receiveIframeMessage(event) {
 	} else if (event.data.patternpartial != undefined) {
 
 		if (!urlHandler.skipBack) {
-			
 			var iFramePath = urlHandler.getFileName(event.data.patternpartial);
 			urlHandler.pushPattern(event.data.patternpartial);
 			if (wsnConnected) {

public/styleguide/js/url-handler.js

@@ -119,9 +119,14 @@ var urlHandler = {
 	* @param  {String}       the shorthand partials syntax for a given pattern
 	*/
 	pushPattern: function (pattern) {
-		console.log("pushed");
 		var data = { "pattern": pattern };
-		history.pushState(data, "", window.location.protocol+"//"+window.location.host+window.location.pathname+"?p="+pattern);
+		var path = window.location.protocol+"//"+window.location.host+window.location.pathname.replace("index.html","")+urlHandler.getFileName(pattern);
+		if (document.getElementById("sg-viewport").contentWindow.location.toString() != path) {
+			urlHandler.skipBack = true;
+			document.getElementById("sg-viewport").contentWindow.location.replace(path);
+		} else {
+			history.pushState(data, "", window.location.protocol+"//"+window.location.host+window.location.pathname.replace("index.html","")+"?p="+pattern);
+		}
 	},
 
 	/**

source/_patternlab-files/viewall.mustache

@@ -24,17 +24,23 @@
 
 </div><!--end .sg-main-->
 <script>
+	
 	var body = document.getElementsByTagName('body');
 	body[0].onclick = function() {
-		parent.postMessage({"bodyclick":"bodyclick"},window.location.protocol+"//"+window.location.host)
+		parent.postMessage( { "bodyclick":"bodyclick" }, window.location.protocol+"//"+window.location.host)
 	};
+	
 	var els = document.getElementsByClassName("patternLink");
 	for (i in els) {
 		els[i].onclick = function() {
-			parent.postMessage({"patternpartial":this.getAttribute("data-patternpartial")},window.location.protocol+"//"+window.location.host);
+			parent.postMessage( { "patternpartial": this.getAttribute("data-patternpartial") }, window.location.protocol+"//"+window.location.host);
 			return false;
 		}
 	}
+	
+	// alert the iframe parent that the pattern has loaded. for page follow.
+	parent.postMessage( { "url": window.location.host, "patternpartial": "{{ patternPartial }}" },window.location.protocol+"//"+window.location.host);
+	
 </script>
 </body>
 </html>