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

[dash] Avoid infinite recursion in keynav

Browse Source
This commit is contained in:
Colin Walters 2009-12-18 10:39:02 -05:00
parent 6b1c3d323b
commit 4394bc3e40
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/ui/dash.js
View File

@ -514,7 +514,7 @@ SearchResults.prototype = {
meta.count.set_text(""+providerResults.length); meta.count.set_text(""+providerResults.length);
} }
this.selectDown(); this.selectDown(false);
return true; return true;
}, },
@ -535,7 +535,7 @@ SearchResults.prototype = {
return resultDisplay.selectIndex(index); return resultDisplay.selectIndex(index);
}, },
selectUp: function() { selectUp: function(recursing) {
for (let i = this._selectedProvider; i >= 0; i--) { for (let i = this._selectedProvider; i >= 0; i--) {
let meta = this._providerMeta[i]; let meta = this._providerMeta[i];
if (!meta.actor.visible) if (!meta.actor.visible)
@ -546,13 +546,13 @@ SearchResults.prototype = {
return; return;
} }
} }
if (this._providerMeta.length > 0) { if (this._providerMeta.length > 0 && !recursing) {
this._selectedProvider = this._providerMeta.length - 1; this._selectedProvider = this._providerMeta.length - 1;
this.selectUp(); this.selectUp(true);
} }
}, },
selectDown: function() { selectDown: function(recursing) {
let current = this._selectedProvider; let current = this._selectedProvider;
if (current == -1) if (current == -1)
current = 0; current = 0;
@ -566,9 +566,9 @@ SearchResults.prototype = {
return; return;
} }
} }
if (this._providerMeta.length > 0) { if (this._providerMeta.length > 0 && !recursing) {
this._selectedProvider = 0; this._selectedProvider = 0;
this.selectDown(); this.selectDown(true);
} }
}, },
@ -834,14 +834,14 @@ Dash.prototype = {
} else if (symbol == Clutter.Up) { } else if (symbol == Clutter.Up) {
if (!this._searchActive) if (!this._searchActive)
return true; return true;
this.searchResults.selectUp(); this.searchResults.selectUp(false);
return true; return true;
} else if (symbol == Clutter.Down) { } else if (symbol == Clutter.Down) {
if (!this._searchActive) if (!this._searchActive)
return true; return true;
this.searchResults.selectDown(); this.searchResults.selectDown(false);
return true; return true;
} }
return false; return false;