Merge branch 'release-0.6.4'

dmolsen · dmolsen · commit cbddfc0fafa2 · 2014-01-21T16:27:30.000-05:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,9 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.6.4
+ - FIX: using # for a link won't cause a jump
+ - THX: thanks to @tylersticka for the heads up
+
 PL-v0.6.3
  - FIX: making sure code view is properly encoded
  - THX: thanks to @tylersticka for the heads up
diff --git a/builder/builder.php b/builder/builder.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder CLI - v0.6.3
+ * Pattern Lab Builder CLI - v0.6.4
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/builder/lib/builder.lib.php b/builder/lib/builder.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.6.3
+ * Pattern Lab Builder Class - v0.6.4
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/builder/lib/generator.lib.php b/builder/lib/generator.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Generator Class - v0.6.3
+ * Pattern Lab Generator Class - v0.6.4
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/builder/lib/watcher.lib.php b/builder/lib/watcher.lib.php
@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Watcher Class - v0.6.3
+ * Pattern Lab Watcher Class - v0.6.4
  *
  * Copyright (c) 2013 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
diff --git a/public/styleguide/js/postmessage.js b/public/styleguide/js/postmessage.js
@@ -29,7 +29,10 @@ if (self != top) {
 	for (a in aTags) {
 		aTags[a].onclick = function(e) {
 			e.preventDefault();
-			window.location.replace(this.getAttribute("href"));
+			var href = this.getAttribute("href");
+			if (href != "#") {
+				window.location.replace(href);
+			}
 		};
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<?php`
`2`	`2`
`3`	`3`	`/*!`
`4`		`- * Pattern Lab Builder CLI - v0.6.3`
	`4`	`+ * Pattern Lab Builder CLI - v0.6.4`
`5`	`5`	`*`
`6`	`6`	`* Copyright (c) 2013 Dave Olsen, http://dmolsen.com`
`7`	`7`	`* Licensed under the MIT license`