Bug 922187 - Properly catch exceptions in checkInstalled and fire the error callback on the DOM request. r=myk

This commit is contained in:
Marco Castelluccio 2014-06-24 00:40:56 +02:00
Родитель e3e3df494f
Коммит 8fba853f1e
2 изменённых файлов: 17 добавлений и 5 удалений

Просмотреть файл

@ -181,10 +181,17 @@ WebappsRegistry.prototype = {
checkInstalled: function(aManifestURL) {
let manifestURL = Services.io.newURI(aManifestURL, null, this._window.document.baseURIObject);
this._window.document.nodePrincipal.checkMayLoad(manifestURL, true, false);
let request = this.createRequest();
try {
this._window.document.nodePrincipal.checkMayLoad(manifestURL, true,
false);
} catch (ex) {
Services.DOMRequest.fireErrorAsync(request, "CROSS_ORIGIN_CHECK_NOT_ALLOWED");
return request;
}
this.addMessageListeners("Webapps:CheckInstalled:Return:OK");
cpmm.sendAsyncMessage("Webapps:CheckInstalled", { origin: this._getOrigin(this._window.location.href),
manifestURL: manifestURL.spec,

Просмотреть файл

@ -34,11 +34,16 @@
break;
case "checkInstalledWrong":
try {
navigator.mozApps.checkInstalled('http://something.org/manifest.webapp');
var request = navigator.mozApps.checkInstalled('http://something.org/manifest.webapp');
request.onsuccess = function() {
finish(false);
} catch (e) {
finish(true);
}
request.onerror = function() {
if (this.error.name == "CROSS_ORIGIN_URL_NOT_ALLOWED") {
finish(true);
} else {
finish(false);
}
}
break;