Merge pull request #491 from BetterErrors/fix/hiding-hint-not-working…

…-when-frame-changes Fix "live shell" hint reappearing when frame changed
BetterErrors · Nov 4, 2020 · afc1e3e · afc1e3e
2 parents 66f2949 + 9d7256b
commit afc1e3e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/lib/better_errors/templates/main.erb b/lib/better_errors/templates/main.erb
@@ -595,6 +595,9 @@
         color: #8080a0;
         padding-left: 20px;
     }
+    .console-has-been-used .live-console-hint {
+        display: none;
+    }
 
     .hint:before {
         content: '\25b2';
@@ -817,6 +820,28 @@
         return html.replace(/&/, "&amp;").replace(/</g, "&lt;");
     }
 
+    function hasConsoleBeenUsedPreviously() {
+      return !!document.cookie.split('; ').find(function(cookie) {
+          return cookie.startsWith('BetterErrors-has-used-console=');
+      });
+    }
+
+    var consoleHasBeenUsed = hasConsoleBeenUsedPreviously();
+
+    function consoleWasJustUsed() {
+        if (consoleHasBeenUsed) {
+            return;
+        }
+
+        hideConsoleHint();
+        consoleHasBeenUsed = true;
+        document.cookie = "BetterErrors-has-used-console=true;path=/;max-age=31536000;samesite"
+    }
+
+    function hideConsoleHint() {
+        document.querySelector('body').className += " console-has-been-used";
+    }
+
     function REPL(index) {
         this.index = index;
 
@@ -838,32 +863,21 @@
         this.inputElement   = this.container.querySelector("input");
         this.outputElement  = this.container.querySelector("pre");
 
-        this.hasUsedConsole = document.cookie.split('; ').find(function(cookie) {
-            return cookie.startsWith('BetterErrors-has-used-console=');
-        });
-        if (this.hasUsedConsole) {
-            this.hideConsoleHint();
+        if (consoleHasBeenUsed) {
+            hideConsoleHint();
         }
 
         var self = this;
         this.inputElement.onkeydown = function(ev) {
             self.onKeyDown(ev);
-            if (!self.hasUsedConsole) {
-                self.hideConsoleHint();
-                self.hasUsedConsole = true;
-                document.cookie = "BetterErrors-has-used-console=true;path=/;max-age=31536000;samesite"
-            }
+            consoleWasJustUsed();
         };
 
         this.setPrompt(">>");
 
         REPL.all[this.index] = this;
     };
 
-    REPL.prototype.hideConsoleHint = function() {
-        document.querySelector('#live-shell-hint').style["display"] = "none";
-    };
-
     REPL.prototype.focus = function() {
         this.inputElement.focus();
     };

diff --git a/lib/better_errors/templates/variable_info.erb b/lib/better_errors/templates/variable_info.erb
@@ -25,7 +25,7 @@
 </header>
 
 <% if BetterErrors.binding_of_caller_available? && @frame.frame_binding %>
-    <div class="hint" id='live-shell-hint'>
+    <div class="hint live-console-hint">
         This is a live shell. Type in here.
     </div>