From 97c00473dfe82c72eaaa32cc42e4d24caf9b1bee Mon Sep 17 00:00:00 2001 From: Bill Gianopoulos Date: Tue, 17 Apr 2012 20:00:51 -0400 Subject: [PATCH] Bug 745567: Integrate bug 702284 and bug 728737 patches, r=mbrubeck a=xul-only --- mobile/xul/chrome/content/about.xhtml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/mobile/xul/chrome/content/about.xhtml b/mobile/xul/chrome/content/about.xhtml index 59d4fd5c56d0..abd41111b1a5 100644 --- a/mobile/xul/chrome/content/about.xhtml +++ b/mobile/xul/chrome/content/about.xhtml @@ -96,7 +96,8 @@ let Ci = Components.interfaces, Cc = Components.classes, Cu = Components.utils, Cr = Components.results; Cu.import("resource://gre/modules/Services.jsm"); - // Include the build date if this is an "a#" (nightly or aurora) build + // Include the build date and 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; @@ -106,6 +107,7 @@ versionPara.appendChild(br); let date = document.createTextNode("(" + buildDate + ")"); versionPara.appendChild(date); + document.getElementById("aboutTelemetry").hidden = false; } // get URLs from prefs @@ -248,12 +250,6 @@ }, 2000); } #endif - // Display warning about telemetry - // if this is an "a#" (Nightly or Aurora) build - let version = Services.appinfo.version; - if (/a\d+$/.test(version)) { - document.getElementById("aboutTelemetry").hidden = false; - } ]]>