wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1167063 - Use string to replace nsIURI in aApps.widgetPages. r=fabrice

Browse Source 
DONTBUILD
This commit is contained in:
Junior Hsu 2015-05-27 00:59:00 -04:00
parent 6f35725f30
commit d3be8405ac
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/apps/AppsUtils.jsm
View File

@ -66,7 +66,8 @@ mozIApplication.prototype = {
let uri = Services.io.newURI(aPageURL, null, null); let uri = Services.io.newURI(aPageURL, null, null);
let filepath = AppsUtils.getFilePath(uri.path); let filepath = AppsUtils.getFilePath(uri.path);
let eliminatedUri = Services.io.newURI(uri.prePath + filepath, null, null); let eliminatedUri = Services.io.newURI(uri.prePath + filepath, null, null);
let equalCriterion = aUri => aUri.equals(eliminatedUri); let equalCriterion = aUrl => Services.io.newURI(aUrl, null, null)
.equals(eliminatedUri);
return this.widgetPages.find(equalCriterion) !== undefined; return this.widgetPages.find(equalCriterion) !== undefined;
}, },

2
dom/apps/Webapps.jsm
View File

@ -396,7 +396,7 @@ this.DOMApplicationRegistry = {
if (aManifest.widgetPages) { if (aManifest.widgetPages) {
let resolve = (aPage)=>{ let resolve = (aPage)=>{
let filepath = AppsUtils.getFilePath(aPage); let filepath = AppsUtils.getFilePath(aPage);
return Services.io.newURI(aManifest.resolveURL(filepath), null, null); return aManifest.resolveURL(filepath);
}; };
aDestApp.widgetPages = aManifest.widgetPages.map(resolve); aDestApp.widgetPages = aManifest.widgetPages.map(resolve);
} else { } else {

2
dom/apps/tests/unit/test_has_widget_criterion.js
View File

@ -13,7 +13,7 @@ add_test(function test_has_widget_criterion() {
let resolve = (aPage)=>{ let resolve = (aPage)=>{
let filepath = AppsUtils.getFilePath(aPage); let filepath = AppsUtils.getFilePath(aPage);
return Services.io.newURI(baseUri.resolve(filepath), null, null); return baseUri.resolve(filepath);
}; };
let widgetPages = ['/widget.html', let widgetPages = ['/widget.html',