Merge branch 'dev' into feature/exclude-tags

Author: bmuenzenmeyer

packages/docs/src/_includes/components/logo.njk

@@ -1,7 +1,7 @@
 
 <h3 class="c-logo">
 	<a href="/" class="c-logo__link" rel="home">
-	    <img class="c-logo__img" src="https://patternlab.io/assets/icon-atom.svg" alt="Pattern Lab">
+	    <img class="c-logo__img" src="https://patternlab.io/images/icon-atom.svg" alt="Pattern Lab">
 
 		<div class="c-logo__body">
 			<span class="c-logo__text">Pattern Lab</span>

packages/plugin-tab/dist/js/@pattern-lab-plugin-tab.js

@@ -6,6 +6,15 @@ window.PluginTab = {
   init: function() {
     //placeholder that will be replaced during configuation
     //most plugins could probably just implement logic here instead.
-    /*SNIPPETS*/
+    function addPanels() {
+      /*SNIPPETS*/
+    }
+
+    // workaround to try recovering from load order race conditions
+    if (window.patternlab && window.patternlab.panels) {
+      addPanels();
+    } else {
+      document.addEventListener('patternLab.pageLoad', addPanels);
+    }
   },
 };

packages/plugin-tab/src/snippet.js

@@ -1,21 +1,13 @@
-function addPanels() {
-  window.patternlab.panels.add({
-    id: 'sg-panel-scss',
-    name: 'SCSS',
-    default: false,
-    templateID: 'pl-panel-template-code',
-    httpRequest: true,
-    httpRequestReplace: '.scss',
-    httpRequestCompleted: false,
-    prismHighlight: true,
-    language: 'scss',
-    keyCombo: 'ctrl+shift+z',
-  });
-}
-
-// workaround to try recovering from load order race conditions
-if (window.patternlab && window.patternlab.panels) {
-  addPanels();
-} else {
-  document.addEventListener('patternLab.pageLoad', addPanels);
-}
+window.patternlab.panels.add({
+  id: 'sg-panel-<<type>>',
+  name: '<<typeUC>>',
+  default: window.config.defaultPatternInfoPanelCode && window.config.defaultPatternInfoPanelCode === "<<type>>",
+  templateID: 'pl-panel-template-code',
+  httpRequest: true,
+  httpRequestReplace: '.<<type>>',
+  httpRequestCompleted: false,
+  prismHighlight: true,
+  language: '<<type>>'//,
+  /* TODO: We would need to find a way to enable keyCombo for multiple panels
+  keyCombo: 'ctrl+shift+z',*/
+});

packages/uikit-workshop/src/scripts/components/panels.js

@@ -68,7 +68,9 @@ function init(event) {
   Panels.add({
     id: 'pl-panel-pattern',
     name: window.config.patternExtension.toUpperCase(),
-    default: true,
+    default: !window.config.defaultPatternInfoPanelCode ||
+              window.config.defaultPatternInfoPanelCode ===
+              window.config.patternExtension,
     templateID: 'pl-panel-template-code',
     httpRequest: true,
     httpRequestReplace: fileSuffixPattern,

packages/uikit-workshop/src/scripts/components/prism-languages.js

@@ -4,6 +4,8 @@ import 'prismjs/components/prism-markup';
 import 'prismjs/components/prism-twig';
 import 'prismjs/components/prism-clike';
 import 'prismjs/components/prism-javascript';
+import 'prismjs/components/prism-typescript';
+import 'prismjs/components/prism-json';
 import 'prismjs/components/prism-css';
 import 'prismjs/components/prism-css-extras';
 import 'prismjs/components/prism-scss';