merge: from master

deckgo · Oct 21, 2019 · 22d4d30 · 22d4d30
2 parents d8b7ce4 + 41f7b9e
commit 22d4d30
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,7 +6,7 @@
 * studio: v1.0.0-beta.7-1 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/studio/CHANGELOG.md))
 
 ### Web Components
-* highlight-code: v1.0.0-rc.1-2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md))
+* highlight-code: v1.0.0-rc.1-3 ([CHANGELOG](https://github.com/deckgo/deckdeckgo/blob/master/webcomponents/highlight-code/CHANGELOG.md))
 
 ### Others
 * starter kit: v1.0.0-rc.4-2 ([CHANGELOG](https://github.com/deckgo/deckdeckgo-starter/blob/master/CHANGELOG.md))

diff --git a/studio/package-lock.json b/studio/package-lock.json
diff --git a/studio/package.json b/studio/package.json
@@ -17,7 +17,7 @@
     "@deckdeckgo/charts": "^1.0.0-rc.3-1",
     "@deckdeckgo/color": "^1.0.0-rc.2-3",
     "@deckdeckgo/core": "^1.0.0-rc.1-2",
-    "@deckdeckgo/highlight-code": "^1.0.0-rc.1-2",
+    "@deckdeckgo/highlight-code": "^1.0.0-rc.1-3",
     "@deckdeckgo/inline-editor": "^1.0.0-rc.3-2",
     "@deckdeckgo/lazy-img": "^1.0.0-rc.1",
     "@deckdeckgo/qrcode": "^1.0.0-rc.1-1",

diff --git a/webcomponents/highlight-code/CHANGELOG.md b/webcomponents/highlight-code/CHANGELOG.md
@@ -1,3 +1,10 @@
+<a name="1.0.0-rc.1-3"></a>
+# 1.0.0-rc.1-3 (2019-10-21)
+
+### Fix
+
+* missing place holder (not displayed)
+
 <a name="1.0.0-rc.1-2"></a>
 # 1.0.0-rc.1-2 (2019-10-21)
 

diff --git a/webcomponents/highlight-code/package-lock.json b/webcomponents/highlight-code/package-lock.json
diff --git a/webcomponents/highlight-code/package.json b/webcomponents/highlight-code/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@deckdeckgo/highlight-code",
-  "version": "1.0.0-rc.1-2",
+  "version": "1.0.0-rc.1-3",
   "description": "A Web Component to highlight your code",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

diff --git a/webcomponents/highlight-code/src/components/highlight-code/deckdeckgo-highlight-code.tsx b/webcomponents/highlight-code/src/components/highlight-code/deckdeckgo-highlight-code.tsx
@@ -181,6 +181,11 @@ export class DeckdeckgoHighlightCode {
     return new Promise<void>(async (resolve, reject) => {
       const container: HTMLElement = this.el.shadowRoot.querySelector('div.deckgo-highlight-code-container');
 
+      if (!code || code === undefined || code === '') {
+        resolve();
+        return;
+      }
+
       if (container) {
         try {
           // clear the container first

diff --git a/webcomponents/highlight-code/src/index.html b/webcomponents/highlight-code/src/index.html
@@ -131,7 +131,7 @@ <h1>Without line numbers</h1>
 </deckgo-highlight-code>
 
 <h1>Issue #423</h1>
-<deckgo-highlight-code language="java" highlight-lines="6,7">
+<deckgo-highlight-code language="java" highlight-lines="6,7 13,14">
   <code slot="code"># main.tf
 
     resource "aws_lambda_function" "api" {