Merge branch 'dev'

Author: dmolsen

dist/styleguide/js/patternlab-pattern.js

@@ -403,6 +403,7 @@ var modalStyleguide = {
       var el = document.getElementById('sg-pattern-data-'+patternPartial);
       modalStyleguide.collectAndSend(el, true, false);
     } else {
+      modalStyleguide.highlightsHide();
       modalStyleguide.close(patternPartial);
     }
 
@@ -474,6 +475,21 @@ var modalStyleguide = {
     }
   },
 
+  /**
+  * hide the highlights
+  */
+  highlightsHide: function(patternPartial) {
+    var patternPartialSelector = (patternPartial !== undefined) ? '#'+patternPartial+" > " : "";
+    elsToHide = document.querySelectorAll(patternPartialSelector+'.has-annotation');
+    for (i = 0; i < elsToHide.length; i++) {
+      elsToHide[i].classList.remove('has-annotation');
+    }
+    elsToHide = document.querySelectorAll(patternPartialSelector+'.annotation-tip');
+    for (i = 0; i < elsToHide.length; i++) {
+      elsToHide[i].style.display = 'none';
+    }
+  },
+  
   /**
   * return the pattern info to the top level
   * @param  {Object}       the content that will be sent to the viewer for rendering
@@ -576,14 +592,7 @@ var modalStyleguide = {
 
     } else if ((data.event !== undefined) && (data.event == 'patternLab.annotationsHighlightHide')) {
 
-      elsToHide = document.querySelectorAll('.has-annotation');
-      for (i = 0; i < elsToHide.length; i++) {
-        elsToHide[i].classList.remove('has-annotation');
-      }
-      elsToHide = document.querySelectorAll('.annotation-tip');
-      for (i = 0; i < elsToHide.length; i++) {
-        elsToHide[i].style.display = 'none';
-      }
+      modalStyleguide.highlightsHide();
 
     } else if ((data.event !== undefined) && (data.event == 'patternLab.patternModalClose')) {