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 798358 - Use learnmore link for addons on about:home. r=mfinkle

Browse Source
This commit is contained in:
Wes Johnston 2013-01-10 11:00:59 -08:00
parent 3c1414905d
commit 7dad19c9d5
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/android/app/recommended-addons.json
View File

@ -4,12 +4,12 @@
"name": "Full Screen",
"version": "3.4",
"iconURL": "https://addons.cdn.mozilla.net/img/uploads/addon_icons/252/252573-32.png?modified=1354183977",
"homepageURL": "https://addons.mozilla.org/en-US/android/addon/full-screen-252573/?src=api"
"learnmoreURL": "https://addons.mozilla.org/en-US/android/addon/full-screen-252573/?src=api"
}, {
"id": "cloudviewer@starkravingfinkle.org",
"name": "Cloud Viewer",
"version": "2.1",
"iconURL": "https://addons.cdn.mozilla.net/img/uploads/addon_icons/295/295895-32.png?modified=1353947644",
"homepageURL": "https://addons.mozilla.org/en-US/android/addon/cloud-viewer/?src=api"
"learnmoreURL": "https://addons.mozilla.org/en-US/android/addon/cloud-viewer/?src=api"
}]
}

4
mobile/android/base/widget/AddonsSection.java
View File

@ -204,7 +204,9 @@ public class AddonsSection extends AboutHomeSection {
String iconUrl = addonJSON.getString("iconURL");
String pageUrl = getPageUrlFromIconUrl(iconUrl);
final String homepageUrl = addonJSON.getString("homepageURL");
// homepageURL may point to non-AMO installs. For now we use learnmoreURL instead
// which is more likely to point to a mobile AMO page
final String homepageUrl = addonJSON.getString("learnmoreURL");
row.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

2
mobile/android/components/AddonUpdateService.js
View File

@ -175,7 +175,7 @@ var RecommendedSearchResults = {
id: aAddon.id,
name: aAddon.name,
version: aAddon.version,
homepageURL: aAddon.homepageURL,
learnmoreURL: aAddon.learnmoreURL,
iconURL: aAddon.iconURL
})
});

8
toolkit/mozapps/extensions/AddonRepository.jsm
View File

@ -221,6 +221,11 @@ AddonSearchResult.prototype = {
*/
homepageURL: null,
/**
* The homepage for the add-on
*/
learnmoreURL: null,
/**
* The support URL for the add-on
*/
@ -1073,7 +1078,8 @@ this.AddonRepository = {
}
break;
case "learnmore":
addon.homepageURL = addon.homepageURL || this._getTextContent(node);
addon.learnmoreURL = this._getTextContent(node);
addon.homepageURL = addon.homepageURL || addon.learnmoreURL;
break;
case "contribution_data":
let meetDevelopers = this._getDescendantTextContent(node, "meet_developers");

3
toolkit/mozapps/extensions/test/xpcshell/test_AddonRepository.js
View File

@ -72,6 +72,7 @@ var GET_RESULTS = [{
caption: "Caption 2 - 1"
}],
homepageURL: BASE_URL + "/learnmore1.html",
learnmoreURL: BASE_URL + "/learnmore1.html",
supportURL: BASE_URL + "/support1.html",
contributionURL: BASE_URL + "/meetDevelopers1.html",
contributionAmount: "$11.11",
@ -151,6 +152,7 @@ var SEARCH_RESULTS = [{
}],
homepageURL: BASE_URL + "/learnmore2.html",
supportURL: BASE_URL + "/support2.html",
learnmoreURL: BASE_URL + "/learnmore2.html",
contributionURL: BASE_URL + "/meetDevelopers2.html",
contributionAmount: null,
repositoryStatus: 4,
@ -190,6 +192,7 @@ var SEARCH_RESULTS = [{
}],
homepageURL: BASE_URL + "/homepage3.html",
supportURL: BASE_URL + "/support3.html",
learnmoreURL: BASE_URL + "/learnmore3.html",
contributionURL: BASE_URL + "/meetDevelopers3.html",
contributionAmount: "$11.11",
averageRating: 2,