Merge branch 'release-0.6.3'

Author: dmolsen

CHANGELOG

@@ -1,5 +1,9 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.6.3
+ - FIX: making sure code view is properly encoded
+ - THX: thanks to @tylersticka for the heads up
+
 PL-v0.6.2
  - FIX: a few small sass and styling tweaks
  - THX: thanks to @griffinartworks for the sass and styling fixes

builder/builder.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder CLI - v0.6.2
+ * Pattern Lab Builder CLI - v0.6.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.6.2
+ * Pattern Lab Builder Class - v0.6.3
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -198,7 +198,7 @@ private function generatePatternFile($f) {
 		$pp = $this->getPatternPartial($f);
 		$fr = str_replace("{{ patternPartial }}",$pp,$fr);
 		$fr = str_replace("{{ lineage }}",json_encode($this->patternLineages[$pp]),$fr);
-		$fr = str_replace("{{ patternHTML }}",$rf,$fr);
+		$fr = str_replace("{{ patternHTML }}",htmlentities($rf),$fr);
 
 		// set-up the mark-up for CSS Rule Saver so it can figure out which rules to save
 		if ($this->enableCSS) {
@@ -620,7 +620,8 @@ protected function gatherPartials() {
 						$patternParts         = explode("/",$path);
 						$patternName          = $this->getPatternName($patternParts[2]);
 						$patternLink          = str_replace("/","-",$path)."/".str_replace("/","-",$path).".html";
-						$patternCode          = $this->renderPattern($path.".mustache");
+						$patternCodeHTML      = $this->renderPattern($path.".mustache");
+						$patternCode          = htmlentities($patternCodeHTML);
 						$patternPartial       = $this->getPatternPartial($path);
 						$patternLineageExists = (count($this->patternLineages[$patternPartial]) > 0) ? true : false;
 						$patternLineages      = $this->patternLineages[$patternPartial];
@@ -630,7 +631,8 @@ protected function gatherPartials() {
 						$p["partials"][] = array("patternName" => ucwords($patternName), 
 						                         "patternLink" => $patternLink, 
 						                         "patternPartialPath" => $patternType."-".$pattern, 
-						                         "patternPartial" => $patternCode,
+						                         "patternCode"    => $patternCode,
+						                         "patternPartial" => $patternCodeHTML,
 						                         "patternCSS" => $patternCSS,
 						                         "patternLineageExists" => $patternLineageExists,
 						                         "patternLineages" => $patternLineages,
@@ -678,7 +680,8 @@ protected function gatherPartialsByMatch($patternType, $patternSubType) {
 				// create the pattern name & link, render the partial, and stick it all into the pattern array
 				$patternName          = $this->getPatternName($patternParts[2]);
 				$patternLink          = str_replace("/","-",$path)."/".str_replace("/","-",$path).".html";
-				$patternCode          = $this->renderPattern($path.".mustache");
+				$patternCodeHTML      = $this->renderPattern($path.".mustache");
+				$patternCode          = htmlentities($patternCodeHTML);
 				$patternPartial       = $this->getPatternPartial($path);
 				$patternLineages      = $this->patternLineages[$patternPartial];
 				$patternLineageExists = (count($patternLineages) > 0) ? true : false;
@@ -687,8 +690,9 @@ protected function gatherPartialsByMatch($patternType, $patternSubType) {
 
 				$p["partials"][] = array("patternName" => ucwords($patternName), 
 				                         "patternLink" => $patternLink, 
-				                         "patternPartialPath" => str_replace(" ","-",$patternTypeClean)."-".str_replace(" ","-",$patternName), 
-				                         "patternPartial" => $patternCode,
+				                         "patternPartialPath" => str_replace(" ","-",$patternTypeClean)."-".str_replace(" ","-",$patternName),
+				                         "patternCode"    => $patternCode,
+				                         "patternPartial" => $patternCodeHTML,
 				                         "patternCSS" => $patternCSS,
 				                         "patternLineageExists" => $patternLineageExists,
 				                         "patternLineages" => $patternLineages,

builder/lib/generator.lib.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.6.2
+ * Pattern Lab Generator Class - v0.6.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.6.2
+ * Pattern Lab Watcher Class - v0.6.3
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license

public/styleguide/js/code-viewer.js

@@ -106,7 +106,7 @@ var codeViewer = {
 			}
 
 			// draw html
-			$("#sg-code-html-fill").text(html);
+			$("#sg-code-html-fill").html(html).text();
 			Prism.highlightElement(document.getElementById("sg-code-html-fill"));
 
 			// draw CSS

source/_patternlab-files/styleguide.mustache

@@ -31,7 +31,7 @@
 								<h3 class="sg-code-head">HTML</h3>
 								<pre class="sg-code-html">
 									<code>
-										{{ patternPartial }}
+										{{{ patternCode }}}
 									</code>
 								</pre>
 								{{# patternCSSExists }}

source/_patternlab-files/viewall.mustache

@@ -31,7 +31,7 @@
 								<h3 class="sg-code-head">HTML</h3>
 								<pre class="sg-code-html">
 									<code>
-										{{ patternPartial }}
+										{{{ patternCode }}}
 									</code>
 								</pre>
 								{{# patternCSSExists }}