Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 337625: OpenSearch plugins that include a Url tag with a type other than text/html don't install, r=mconnor

Browse Source
This commit is contained in:
gavin%gavinsharp.com 2006-05-29 19:19:05 +00:00
parent f4ccbdc1ff
commit 675e5daf18
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
browser/components/search/nsSearchService.js
View File

@ -1138,13 +1138,13 @@ Engine.prototype = {
"Can't call _initFromMetaData on a readonly engine!",
Cr.NS_ERROR_FAILURE);
this._urls.push(new EngineURL("text/html", aMethod, aTemplate));
this._name = aName;
this._alias = aAlias;
this._description = aDescription;
this._setIcon(aIconURL, true);
this._urls.push(new EngineURL("text/html", aMethod, aTemplate));
this._serializeToFile();
},
@ -1152,6 +1152,8 @@ Engine.prototype = {
* Extracts data from an OpenSearch URL element and creates an EngineURL
* object which is then added to the engine's list of URLs.
*
* @throws NS_ERROR_FAILURE if a URL object could not be created.
*
* @see http://opensearch.a9.com/spec/1.1/querysyntax/#urltag.
* @see EngineURL()
*/
@ -1162,13 +1164,25 @@ Engine.prototype = {
var method = aElement.getAttribute("method") || "GET";
var template = aElement.getAttribute("template");
var url = new EngineURL(type, method, template);
try {
var url = new EngineURL(type, method, template);
} catch (ex) {
LOG("_parseURL: failed to add " + template + " as a URL");
throw Cr.NS_ERROR_FAILURE;
}
for (var i = 0; i < aElement.childNodes.length; ++i) {
var param = aElement.childNodes[i];
if (param.localName == "Param")
url.addParam(param.getAttribute("name"), param.getAttribute("value"));
if (param.localName == "Param") {
try {
url.addParam(param.getAttribute("name"), param.getAttribute("value"));
} catch (ex) {
// Ignore failure
LOG("_parseURL: Url element has an invalid param");
}
}
}
this._urls.push(url);
},
@ -1206,7 +1220,11 @@ Engine.prototype = {
this._description = child.textContent;
break;
case "Url":
this._parseURL(child);
try {
this._parseURL(child);
} catch (ex) {
// Parsing of the element failed, just skip it.
}
break;
case "Image":
this._parseImage(child);