mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 417424: AMO Manager: Multiple requests for recommended list on first opening. r=robstrong
This commit is contained in:
parent
8275c3f5e8
commit
748ccd881e
@ -49,7 +49,7 @@ const PREF_GETADDONS_GETRECOMMENDED = "extensions.getAddons.recommended.url
|
||||
const PREF_GETADDONS_BROWSESEARCHRESULTS = "extensions.getAddons.search.browseURL";
|
||||
const PREF_GETADDONS_GETSEARCHRESULTS = "extensions.getAddons.search.url";
|
||||
|
||||
const XMLURI_PARSE_ERROR = "http://www.mozilla.org/newlayout/xml/parsererror.xml"
|
||||
const XMLURI_PARSE_ERROR = "http://www.mozilla.org/newlayout/xml/parsererror.xml";
|
||||
|
||||
function AddonSearchResult() {
|
||||
}
|
||||
@ -88,16 +88,9 @@ AddonRepository.prototype = {
|
||||
// XHR associated with the current request
|
||||
_request: null,
|
||||
|
||||
// How many times in succession has a search yielded no new results. Stops
|
||||
// us trying to find more results indefinately
|
||||
_emptyCount: null,
|
||||
|
||||
// Callback object to notify on completion
|
||||
_callback: null,
|
||||
|
||||
// The uri to pull results from
|
||||
_retrieveURI: null,
|
||||
|
||||
// Maximum number of results to return
|
||||
_maxResults: null,
|
||||
|
||||
@ -145,14 +138,13 @@ AddonRepository.prototype = {
|
||||
this._addons = [];
|
||||
this._callback = aCallback;
|
||||
this._recommended = true;
|
||||
this._emptyCount = 0;
|
||||
this._maxResults = aMaxResults;
|
||||
|
||||
var urlf = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
|
||||
.getService(Components.interfaces.nsIURLFormatter);
|
||||
|
||||
this._retrieveURI = urlf.formatURLPref(PREF_GETADDONS_GETRECOMMENDED);
|
||||
this._loadList();
|
||||
var uri = urlf.formatURLPref(PREF_GETADDONS_GETRECOMMENDED);
|
||||
this._loadList(uri);
|
||||
},
|
||||
|
||||
searchAddons: function(aSearchTerms, aMaxResults, aCallback) {
|
||||
@ -163,7 +155,6 @@ AddonRepository.prototype = {
|
||||
this._addons = [];
|
||||
this._callback = aCallback;
|
||||
this._recommended = false;
|
||||
this._emptyCount = 0;
|
||||
this._maxResults = aMaxResults;
|
||||
|
||||
var prefs = Components.classes["@mozilla.org/preferences-service;1"]
|
||||
@ -171,10 +162,10 @@ AddonRepository.prototype = {
|
||||
var urlf = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"]
|
||||
.getService(Components.interfaces.nsIURLFormatter);
|
||||
|
||||
this._retrieveURI = prefs.getCharPref(PREF_GETADDONS_GETSEARCHRESULTS);
|
||||
this._retrieveURI = this._retrieveURI.replace(/%TERMS%/g, encodeURIComponent(aSearchTerms));
|
||||
this._retrieveURI = urlf.formatURL(this._retrieveURI);
|
||||
this._loadList();
|
||||
var uri = prefs.getCharPref(PREF_GETADDONS_GETSEARCHRESULTS);
|
||||
uri = uri.replace(/%TERMS%/g, encodeURIComponent(aSearchTerms));
|
||||
uri = urlf.formatURL(uri);
|
||||
this._loadList(uri);
|
||||
},
|
||||
|
||||
// Posts results to the callback
|
||||
@ -317,7 +308,6 @@ AddonRepository.prototype = {
|
||||
return;
|
||||
}
|
||||
var elements = responseXML.documentElement.getElementsByTagName("addon");
|
||||
var oldcount = this._addons.length;
|
||||
for (var i = 0; i < elements.length; i++) {
|
||||
this._parseAddon(elements[i]);
|
||||
|
||||
@ -328,26 +318,14 @@ AddonRepository.prototype = {
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// We didn't find any new add-ons this pass
|
||||
if (oldcount == this._addons.length)
|
||||
this._emptyCount++;
|
||||
else
|
||||
this._emptyCount = 0;
|
||||
|
||||
/* We should keep trying to find new recommended add-ons, but bail if we
|
||||
don't get a new result for a few passes. */
|
||||
if (this._recommended && this._emptyCount < 5)
|
||||
this._loadList();
|
||||
else
|
||||
this._reportSuccess(elements.length);
|
||||
this._reportSuccess(elements.length);
|
||||
},
|
||||
|
||||
// Performs a new request for results
|
||||
_loadList: function() {
|
||||
_loadList: function(aURI) {
|
||||
this._request = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].
|
||||
createInstance(Ci.nsIXMLHttpRequest);
|
||||
this._request.open("GET", this._retrieveURI, true);
|
||||
this._request.open("GET", aURI, true);
|
||||
this._request.overrideMimeType("text/xml");
|
||||
|
||||
var self = this;
|
||||
|
Loading…
Reference in New Issue
Block a user