Skip to content

Commit

Permalink
Merge pull request #491 from BetterErrors/fix/hiding-hint-not-working…
Browse files Browse the repository at this point in the history
…-when-frame-changes

Fix "live shell" hint reappearing when frame changed
  • Loading branch information
RobinDaugherty authored Nov 4, 2020
2 parents 66f2949 + 9d7256b commit afc1e3e
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 15 deletions.
42 changes: 28 additions & 14 deletions lib/better_errors/templates/main.erb
Original file line number Diff line number Diff line change
Expand Up @@ -595,6 +595,9 @@
color: #8080a0;
padding-left: 20px;
}
.console-has-been-used .live-console-hint {
display: none;
}

.hint:before {
content: '\25b2';
Expand Down Expand Up @@ -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;

Expand All @@ -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();
};
Expand Down
2 changes: 1 addition & 1 deletion lib/better_errors/templates/variable_info.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit afc1e3e

Please sign in to comment.