Merge pull request #35 from JetBrains/fix-console

JetBrains · Nov 15, 2018 · 27eba28 · 27eba28
2 parents 55eec7b + f1dfbd8
commit 27eba28
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/src/executable-code/executable-fragment.js b/src/executable-code/executable-fragment.js
@@ -24,7 +24,7 @@ const KEY_CODES = {
 const DEBOUNCE_TIME = 500;
 
 const SELECTORS = {
-  CANVAS_PLACEHOLDER_OUTPUT: ".js-code-output-canvas-placeholder",
+  CANVAS_PLACEHOLDER_OUTPUT: ".js-code-output-executor",
   FOLD_BUTTON: ".fold-button",
   UNMODIFIABLE_LINE_DARK: "unmodifiable-line-dark",
   UNMODIFIABLE_LINE: "unmodifiable-line",
@@ -230,7 +230,7 @@ export default class ExecutableFragment extends ExecutableCodeTemplate {
     if (targetPlatform === TargetPlatform.CANVAS) {
       this.jsExecutor.reloadIframeScripts(jsLibs, this.getNodeForMountIframe(TargetPlatform.CANVAS));
     }
-    this.update({output: "", openConsole: false});
+    this.update({output: "", openConsole: false, exception: null});
     if (onCloseConsole) onCloseConsole();
   }
 

diff --git a/src/executable-code/executable-fragment.monk b/src/executable-code/executable-fragment.monk
@@ -14,10 +14,10 @@
             {% endif %}
             <textarea></textarea>
         </div>
-        {% if (openConsole) %}
-          <div class="console-close {{ theme }}" :onclick={{ this.onConsoleCloseButtonEnter.bind(this) }}></div>
-        {% endif %}
-        <div class="js-code-output-canvas-placeholder">
+        <div class="js-code-output-executor">
+          {% if (openConsole) %}
+            <div class="console-close {{ theme }}" :onclick={{ this.onConsoleCloseButtonEnter.bind(this) }}></div>
+          {% endif %}
           {% if (waitingForOutput) %}
               <div class="output-wrapper {{ theme }}">
                 <div class="loader {{ theme }}"></div>

diff --git a/src/js-executor/index.scss b/src/js-executor/index.scss
@@ -1,6 +1,5 @@
 .k2js-iframe {
   display: none;
-  padding-top: 2px
 }
 iframe {
   border: none;

diff --git a/src/styles.scss b/src/styles.scss
@@ -29,6 +29,7 @@ $wt-color-azure: #167dff;
 
 .executable-fragment {
   border: 1px solid $wt-color-athens;
+  border-bottom-width: 0;
 }
 
 .hidden-dependency {
@@ -109,9 +110,8 @@ $wt-color-azure: #167dff;
   height: 20px;
   width: 16px;
   cursor: pointer;
-  background: url("img/run.svg");
   background-size: cover;
-  background-repeat: no-repeat;
+  background: url("img/run.svg") no-repeat;
 
   &._disabled {
     cursor: default;
@@ -209,8 +209,13 @@ $wt-color-azure: #167dff;
   padding-bottom: 2px;
 }
 
-.output-wrapper {
+.js-code-output-executor {
   border-top: 1px solid $wt-color-athens;
+  position: relative;
+}
+
+.output-wrapper {
+  border-bottom: 1px solid $wt-color-athens;
   min-height: 60px;
   font-size: 14px;
   background-color: white;
@@ -262,11 +267,10 @@ $wt-color-azure: #167dff;
 
 .console-close {
   position: absolute;
-  right: 1px;
-  margin-top: 1px;
+  right: 0;
   width: 16px;
   height: 16px;
-  background: $wt-color-silver url('img/close-console-icon.svg');
+  background: $wt-color-silver url('img/close-console-icon.svg') no-repeat;
 }
 
 .console-close.darcula {
@@ -396,9 +400,6 @@ $wt-color-azure: #167dff;
   }
 }
 
-.executable-fragment-wrapper {
-}
-
 .CodeMirror-hints {
   padding-left: 0 !important;
   border: 1px solid $wt-color-silver;