Merge branch 'release-v0.7.1'

Author: dmolsen

CHANGELOG

@@ -1,5 +1,11 @@
 THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
+PL-v0.7.1
+ - FIX: annotation event should only fire when overlay is active
+ - FIX: styleguide should properly sort patterns
+ - THX: thanks to @jplhomer for the heads up on the annotations issue
+ - THX: thanks to @tylersticka for the heads up on the styleguide issue
+
 PL-v0.7.0
  - ADD: auto-reload server can be started directly from the watcher
  - ADD: pattern parameter support

core/builder.php

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

core/config/config.ini.default

@@ -3,7 +3,7 @@
  * If config.ini doesn't exist Pattern Lab will try to create a new version
  */
 
-v  = "0.7.0"
+v  = "0.7.1"
 
 // file extensions to ignore when building or watching the source dir, separate with a comma
 ie = "scss,DS_Store,less"

core/lib/PatternLab/Builder.php

@@ -1,7 +1,7 @@
 <?php
 
 /*!
- * Pattern Lab Builder Class - v0.7.0
+ * Pattern Lab Builder Class - v0.7.1
  *
  * Copyright (c) 2013-2014 Dave Olsen, http://dmolsen.com
  * Licensed under the MIT license
@@ -206,9 +206,6 @@ protected function generateMainPages() {
 			}
 		}
 
-		// sort partials by patternLink
-		usort($sd['partials'], "PatternLab\Builder::sortPartials");
-		
 		// render the "view all" pages
 		$this->generateViewAllPages();
 
@@ -1134,17 +1131,6 @@ public function trim(&$v) {
 		$v = trim($v);
 	}
 
-	/**
-	* Sort the partials generated for the styleguide so that any new ones show up in the correct place
-	* @param  {Array}        items from from one pattern to compare
-	* @param  {Array}        items from another pattern to compare
-	*
-	* @return {Integer}      the result of the string comparison
-	*/
-	public function sortPartials($a,$b) {
-		return strcmp($a["patternLink"],$b["patternLink"]);
-	}
-	
 	/**
 	* Lowercase the given string. Used in the array_walk() function in __construct as a sanity check
 	* @param  {String}       an entry from one of the list-based config entries

core/lib/PatternLab/Configurer.php

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

core/lib/PatternLab/Generator.php

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

core/lib/PatternLab/Migrator.php

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

core/lib/PatternLab/Watcher.php

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

core/styleguide/js/annotations-pattern.js

@@ -37,15 +37,19 @@ var annotationsPattern = {
 						els[i].onclick = (function(item) {
 							return function(e) {
 
-								e.preventDefault();
-								e.stopPropagation();
-								var obj = {};
-								
-								// if an element was clicked on while the overlay was already on swap it
-								obj = { "displaynumber": item.displaynumber, "el": item.el, "title": item.title, "comment": item.comment };
-								
-								var targetOrigin = (window.location.protocol == "file:") ? "*" : window.location.protocol+"//"+window.location.host;
-								parent.postMessage(obj,targetOrigin);
+								if (annotationsPattern.commentsOverlayActive) {
+									
+									e.preventDefault();
+									e.stopPropagation();
+									var obj = {};
+									
+									// if an element was clicked on while the overlay was already on swap it
+									obj = { "displaynumber": item.displaynumber, "el": item.el, "title": item.title, "comment": item.comment };
+									
+									var targetOrigin = (window.location.protocol == "file:") ? "*" : window.location.protocol+"//"+window.location.host;
+									parent.postMessage(obj,targetOrigin);
+									
+								}
 
 							}
 						})(item);

public/styleguide/js/annotations-pattern.js

@@ -37,15 +37,19 @@ var annotationsPattern = {
 						els[i].onclick = (function(item) {
 							return function(e) {
 
-								e.preventDefault();
-								e.stopPropagation();
-								var obj = {};
-								
-								// if an element was clicked on while the overlay was already on swap it
-								obj = { "displaynumber": item.displaynumber, "el": item.el, "title": item.title, "comment": item.comment };
-								
-								var targetOrigin = (window.location.protocol == "file:") ? "*" : window.location.protocol+"//"+window.location.host;
-								parent.postMessage(obj,targetOrigin);
+								if (annotationsPattern.commentsOverlayActive) {
+									
+									e.preventDefault();
+									e.stopPropagation();
+									var obj = {};
+									
+									// if an element was clicked on while the overlay was already on swap it
+									obj = { "displaynumber": item.displaynumber, "el": item.el, "title": item.title, "comment": item.comment };
+									
+									var targetOrigin = (window.location.protocol == "file:") ? "*" : window.location.protocol+"//"+window.location.host;
+									parent.postMessage(obj,targetOrigin);
+									
+								}
 
 							}
 						})(item);