[gnome-shell] lookingGlass: Let history trim input
- From: Marge Bot <marge-bot src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell] lookingGlass: Let history trim input
- Date: Sat, 13 Feb 2021 09:01:23 +0000 (UTC)
commit bbf1fc28ca8403d0a805ac4a35e5b23bb167c171
Author: Lucas Werkmeister <mail lucaswerkmeister de>
Date: Thu Feb 11 19:44:03 2021 +0100
lookingGlass: Let history trim input
Checking whether the item is empty is now the history’s job, per the
previous two commits. The history also trims the input for us.
The effect of this is that we call _history.addItem(), and thereby move
to the end of the history, even if the input is empty (or consists only
of whitespace); clearing the input field and pressing Enter becomes a
quick way to jump back to the end of the history. (The current history
item is not overwritten if the input is empty.)
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1653>
js/ui/lookingGlass.js | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/js/ui/lookingGlass.js b/js/ui/lookingGlass.js
index 728983ea28..e59fa29306 100644
--- a/js/ui/lookingGlass.js
+++ b/js/ui/lookingGlass.js
@@ -1129,10 +1129,6 @@ class LookingGlass extends St.BoxLayout {
// Ensure we don't get newlines in the command; the history file is
// newline-separated.
text = text.replace('\n', ' ');
- // Strip leading and trailing whitespace
- text = text.replace(/^\s+/g, '').replace(/\s+$/g, '');
- if (text == '')
- return true;
this._evaluate(text);
return true;
});
@@ -1240,7 +1236,9 @@ class LookingGlass extends St.BoxLayout {
}
_evaluate(command) {
- this._history.addItem(command);
+ command = this._history.addItem(command); // trims command
+ if (!command)
+ return;
let lines = command.split(';');
lines.push('return %s'.format(lines.pop()));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]