brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

history: Allow events to bubble up when arrowing past the first/last item

Browse Source 
Currently the HistoryManager consumes all arrow up/down key presses
unconditionally. Change this to only consume the event if the entry
text was actually changed, e.g. not when trying to move past the
first/last item.

https://bugzilla.gnome.org/show_bug.cgi?id=682243
This commit is contained in:
Florian Müllner 2012-09-17 20:50:27 +02:00
parent c0ff02d9c7
commit 2c130c8668
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/misc/history.js
View File

@ -41,24 +41,26 @@ const HistoryManager = new Lang.Class({
this._historyIndex = this._history.length; this._historyIndex = this._history.length;
}, },
prevItem: function(text) { _setPrevItem: function(text) {
if (this._historyIndex <= 0) if (this._historyIndex <= 0)
return text; return false;
if (text) if (text)
this._history[this._historyIndex] = text; this._history[this._historyIndex] = text;
this._historyIndex--; this._historyIndex--;
return this._indexChanged(); this._indexChanged();
return true;
}, },
nextItem: function(text) { _setNextItem: function(text) {
if (this._historyIndex >= this._history.length) if (this._historyIndex >= this._history.length)
return text; return false;
if (text) if (text)
this._history[this._historyIndex] = text; this._history[this._historyIndex] = text;
this._historyIndex++; this._historyIndex++;
return this._indexChanged(); this._indexChanged();
return true;
}, },
lastItem: function() { lastItem: function() {
@ -83,11 +85,9 @@ const HistoryManager = new Lang.Class({
_onEntryKeyPress: function(entry, event) { _onEntryKeyPress: function(entry, event) {
let symbol = event.get_key_symbol(); let symbol = event.get_key_symbol();
if (symbol == Clutter.KEY_Up) { if (symbol == Clutter.KEY_Up) {
this.prevItem(entry.get_text()); return this._setPrevItem(entry.get_text());
return true;
} else if (symbol == Clutter.KEY_Down) { } else if (symbol == Clutter.KEY_Down) {
this.nextItem(entry.get_text()); return this._setNextItem(entry.get_text());
return true;
} }
return false; return false;
}, },
@ -98,8 +98,6 @@ const HistoryManager = new Lang.Class({
if (this._entry) if (this._entry)
this._entry.set_text(current); this._entry.set_text(current);
return current;
}, },
_save: function() { _save: function() {