Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code
Issues
All Issues

Unified Diff: mobile/android/chrome/content/aboutAdblockBrowser.xhtml

Issue 29981605: Issue 7211 - About Adblock Browser is opening about:firefox (Closed)
Patch Set: Created Jan. 14, 2019, 10:33 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mobile/android/app/src/main/res/xml/preferences_vendor.xml ('k') | mobile/android/components/AboutRedirector.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mobile/android/chrome/content/aboutAdblockBrowser.xhtml
===================================================================
--- a/mobile/android/chrome/content/aboutAdblockBrowser.xhtml
+++ b/mobile/android/chrome/content/aboutAdblockBrowser.xhtml
@@ -17,196 +17,48 @@
<head>
<meta name="viewport" content="width=480; initial-scale=.6667; user-scalable=no"/>
<title>&aboutPage.title;</title>
<link rel="stylesheet" href="chrome://browser/skin/aboutPageAdblockBrowser.css" type="text/css"/>
<link rel="icon" type="image/png" sizes="64x64" href="chrome://branding/content/favicon64.png" />
</head>
<body dir="&locale.dir;">
+ <div id="header" dir="ltr">
+ <p id="wordmark">Adblock Browser</p>
+#expand <p id="version">__MOZ_APP_VERSION_DISPLAY__</p>
+ </div>
+
<div id="banner">
- <div id="header">
- <p id="wordmark">Adblock <b>Browser</b></p>
-#expand <p id="version">__MOZ_APP_VERSION__</p>
- </div>
-
+ <div id="logo"/>
#ifdef MOZ_UPDATER
<div id="updateBox">
- <a id="updateLink" href="" onclick="checkForUpdates();">&aboutPage.checkForUpdates.link;</a>
+ <a id="updateLink" href="">&aboutPage.checkForUpdates.link;</a>
<span id="update-message-checking">&aboutPage.checkForUpdates.checking;</span>
<span id="update-message-none">&aboutPage.checkForUpdates.none;</span>
- <span id="update-message-found" onclick="downloadUpdate()">&aboutPage.checkForUpdates.available2;</span>
+ <span id="update-message-found">&aboutPage.checkForUpdates.available2;</span>
<span id="update-message-downloading">&aboutPage.checkForUpdates.downloading;</span>
- <span id="update-message-downloaded" onclick="installUpdate()">&aboutPage.checkForUpdates.downloaded2;</span>
+ <span id="update-message-downloaded">&aboutPage.checkForUpdates.downloaded2;</span>
</div>
#endif
<div id="messages">
<p id="distributionAbout" hidden="true"/>
<p id="distributionID" hidden="true"/>
<p id="telemetry" hidden="true">
&aboutPage.warningVersion;
-#ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
- &aboutPage.telemetryStart;<a href="http://www.mozilla.org/">&aboutPage.telemetryMozillaLink;</a>&aboutPage.telemetryEnd;
-#endif
</p>
</div>
</div>
<ul id="aboutLinks">
<div class="top-border"></div>
<li><a id="faqURL">&aboutPage.faq.label;</a></li>
<li><a id="privacyURL">&aboutPage.privacyPolicy.label;</a></li>
<li><a id="creditsURL">&aboutPage.credits.label;</a></li>
<div class="bottom-border"></div>
</ul>
- <div id="aboutDetails">
- <p>&logoTrademark;</p>
- </div>
+ <script type="application/javascript" src="chrome://browser/content/about.js" />
- <script type="application/javascript;version=1.8"><![CDATA[
- let Ci = Components.interfaces, Cc = Components.classes, Cu = Components.utils, Cr = Components.results;
- Cu.import("resource://gre/modules/XPCOMUtils.jsm");
- Cu.import("resource://gre/modules/Services.jsm");
-
- // Include the build date and a warning about Telemetry
- // if this is an "a#" (nightly or aurora) build
-#expand const version = "__MOZ_APP_VERSION__";
- if (/a\d+$/.test(version)) {
- let buildID = Services.appinfo.appBuildID;
- let buildDate = buildID.slice(0,4) + "-" + buildID.slice(4,6) + "-" + buildID.slice(6,8);
- let br = document.createElement("br");
- let versionPara = document.getElementById("version");
- versionPara.appendChild(br);
- let date = document.createTextNode("(" + buildDate + ")");
- versionPara.appendChild(date);
- document.getElementById("telemetry").hidden = false;
- }
-
- // Always append the build ID in Adblock Browser.
- document.getElementById("version").innerHTML = version + "." +
- Services.appinfo.appBuildID;
-
- // Include the Distribution information if available
- try {
- let distroId = Services.prefs.getCharPref("distribution.id");
- if (distroId) {
- let distroVersion = Services.prefs.getCharPref("distribution.version");
- let distroIdField = document.getElementById("distributionID");
- distroIdField.textContent = distroId + " - " + distroVersion;
- distroIdField.hidden = false;
-
- let distroAbout = Services.prefs.getComplexValue("distribution.about", Ci.nsISupportsString);
- let distroField = document.getElementById("distributionAbout");
- distroField.textContent = distroAbout;
- distroField.hidden = false;
- }
- } catch (e) {
- // Pref is unset
- }
-
- // Using formatted URLs. See https://issues.adblockplus.org/ticket/3220
- // get URLs from prefs
- try {
- let formatter = Cc["@mozilla.org/toolkit/URLFormatterService;1"].getService(Ci.nsIURLFormatter);
-
- let links = [
- {id: "faqURL", pref: "app.faqURL"},
- {id: "privacyURL", pref: "app.privacyURL"},
- {id: "creditsURL", pref: "app.creditsURL"},
- ];
-
- links.forEach(function(link) {
- let url = formatter.formatURLPref(link.pref);
- let element = document.getElementById(link.id);
- element.setAttribute("href", url);
- });
- } catch (ex) {}
-
-#ifdef MOZ_UPDATER
- let Updater = {
- update: null,
-
- init: function() {
- Services.obs.addObserver(this, "Update:CheckResult", false);
- },
-
- observe: function(aSubject, aTopic, aData) {
- if (aTopic == "Update:CheckResult") {
- showUpdateMessage(aData);
- }
- },
- };
-
- Updater.init();
-
- function checkForUpdates() {
- showCheckingMessage();
-
- Services.androidBridge.handleGeckoMessage({ type: "Update:Check" });
- }
-
- function downloadUpdate() {
- Services.androidBridge.handleGeckoMessage({ type: "Update:Download" });
- }
-
- function installUpdate() {
- showCheckAction();
-
- Services.androidBridge.handleGeckoMessage({ type: "Update:Install" });
- }
-
- let updateLink = document.getElementById("updateLink");
- let checkingSpan = document.getElementById("update-message-checking");
- let noneSpan = document.getElementById("update-message-none");
- let foundSpan = document.getElementById("update-message-found");
- let downloadingSpan = document.getElementById("update-message-downloading");
- let downloadedSpan = document.getElementById("update-message-downloaded");
-
- function showCheckAction() {
- checkingSpan.style.display = "none";
- noneSpan.style.display = "none";
- foundSpan.style.display = "none";
- downloadingSpan.style.display = "none";
- downloadedSpan.style.display = "none";
- updateLink.style.display = "block";
- }
-
- function showCheckingMessage() {
- updateLink.style.display = "none";
- noneSpan.style.display = "none";
- foundSpan.style.display = "none";
- downloadingSpan.style.display = "none";
- downloadedSpan.style.display = "none";
- checkingSpan.style.display = "block";
- }
-
- function showUpdateMessage(aResult) {
- updateLink.style.display = "none";
- checkingSpan.style.display = "none";
- noneSpan.style.display = "none";
- foundSpan.style.display = "none";
- downloadingSpan.style.display = "none";
- downloadedSpan.style.display = "none";
-
- // the aResult values come from mobile/android/base/UpdateServiceHelper.java
- switch (aResult) {
- case "NOT_AVAILABLE":
- noneSpan.style.display = "block";
- setTimeout(showCheckAction, 2000);
- break;
- case "AVAILABLE":
- foundSpan.style.display = "block";
- break;
- case "DOWNLOADING":
- downloadingSpan.style.display = "block";
- break;
- case "DOWNLOADED":
- downloadedSpan.style.display = "block";
- break;
- }
- }
-#endif
- ]]></script>
</body>
</html>
« no previous file with comments | « mobile/android/app/src/main/res/xml/preferences_vendor.xml ('k') | mobile/android/components/AboutRedirector.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld