Merge branch 'master' into dev

Author: dmolsen

core/styleguide/js/annotations-pattern.js

@@ -110,7 +110,9 @@ var annotationsPattern = {
 
 		var parentEl;
 
-		if (el.parentNode.classList.contains("sg-pattern")) {
+		if (el.classList.contains("sg-pattern")) {
+			return el;
+		} else if (el.parentNode.classList.contains("sg-pattern")) {
 			return el.parentNode;
 		} else {
 			parentEl = annotationsPattern.findParent(el.parentNode);

core/styleguide/js/annotations-viewer.js

@@ -9,9 +9,10 @@
 var annotationsViewer = {
 
 	// set-up default sections
-	commentsActive: false,
-	targetOrigin:   (window.location.protocol === "file:") ? "*" : window.location.protocol+"//"+window.location.host,
-	moveToOnInit:   0,
+	commentsActive:          false,
+	commentsViewAllActive:   true,
+	targetOrigin:            (window.location.protocol === "file:") ? "*" : window.location.protocol+"//"+window.location.host,
+	moveToOnInit:            0,
 
 	/**
 	* add the onclick handler to the annotations link in the main nav
@@ -238,6 +239,11 @@ var annotationsViewer = {
 					return false;
 				}
 			}
+		} else if (data.patternpartial !== undefined) {
+			if (annotationsViewer.commentsViewAllActive && (data.patternpartial.indexOf("viewall-") != -1)) {
+				var obj = JSON.stringify({ "commentToggle": "on" });
+				document.getElementById('sg-viewport').contentWindow.postMessage(obj,annotationsViewer.targetOrigin);
+			}
 		}
 
 	}

public/styleguide/js/annotations-pattern.js

@@ -110,7 +110,9 @@ var annotationsPattern = {
 
 		var parentEl;
 
-		if (el.parentNode.classList.contains("sg-pattern")) {
+		if (el.classList.contains("sg-pattern")) {
+			return el;
+		} else if (el.parentNode.classList.contains("sg-pattern")) {
 			return el.parentNode;
 		} else {
 			parentEl = annotationsPattern.findParent(el.parentNode);

public/styleguide/js/annotations-viewer.js

@@ -9,9 +9,10 @@
 var annotationsViewer = {
 
 	// set-up default sections
-	commentsActive: false,
-	targetOrigin:   (window.location.protocol === "file:") ? "*" : window.location.protocol+"//"+window.location.host,
-	moveToOnInit:   0,
+	commentsActive:          false,
+	commentsViewAllActive:   false,
+	targetOrigin:            (window.location.protocol === "file:") ? "*" : window.location.protocol+"//"+window.location.host,
+	moveToOnInit:            0,
 
 	/**
 	* add the onclick handler to the annotations link in the main nav
@@ -238,6 +239,11 @@ var annotationsViewer = {
 					return false;
 				}
 			}
+		} else if (data.patternpartial !== undefined) {
+			if (annotationsViewer.commentsViewAllActive && (data.patternpartial.indexOf("viewall-") != -1)) {
+				var obj = JSON.stringify({ "commentToggle": "on" });
+				document.getElementById('sg-viewport').contentWindow.postMessage(obj,annotationsViewer.targetOrigin);
+			}
 		}
 
 	}