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

RemoteSearch: don't sort the last explicitly sorted provider last

Browse Source 
It's a confusing semantic, and keeping it causes bugs in the control
center panels.

https://bugzilla.gnome.org/show_bug.cgi?id=694974
This commit is contained in:
Giovanni Campagna 2013-03-02 02:27:56 +01:00
parent 098bc41083
commit 78272e5592
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/remoteSearch.js
View File

@ -127,8 +127,6 @@ function remoteProvidersLoaded(loadState) {
// Special case gnome-control-center to be always active and always first // Special case gnome-control-center to be always active and always first
sortOrder.unshift('gnome-control-center.desktop'); sortOrder.unshift('gnome-control-center.desktop');
let numSorted = sortOrder.length;
loadState.loadedProviders.sort( loadState.loadedProviders.sort(
function(providerA, providerB) { function(providerA, providerB) {
let idxA, idxB; let idxA, idxB;
@ -148,15 +146,6 @@ function remoteProvidersLoaded(loadState) {
return GLib.utf8_collate(nameA, nameB); return GLib.utf8_collate(nameA, nameB);
} }
if (numSorted > 1) {
// if providerA is the last, it goes after everything
if ((idxA + 1) == numSorted)
return 1;
// if providerB is the last, it goes after everything
else if ((idxB + 1) == numSorted)
return -1;
}
// if providerA isn't found, it's sorted after providerB // if providerA isn't found, it's sorted after providerB
if (idxA == -1) if (idxA == -1)
return 1; return 1;