From 5c5e393f16e2108fdacf672ea9f266209d7ed777 Mon Sep 17 00:00:00 2001
From: Brian Nicholson <bnicholson@mozilla.com>
Date: Thu, 23 Aug 2012 00:06:17 -0700
Subject: [PATCH] Bug 778582 - Part 4. r=lucasr

---
 mobile/android/chrome/content/aboutReader.html | 3 +--
 mobile/android/chrome/content/aboutReader.js   | 4 +---
 mobile/android/components/AboutRedirector.js   | 3 ++-
 mobile/android/themes/core/aboutReader.css     | 7 ++-----
 mobile/android/themes/core/jar.mn              | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/mobile/android/chrome/content/aboutReader.html b/mobile/android/chrome/content/aboutReader.html
index 9143fef58f9..07e853ef381 100644
--- a/mobile/android/chrome/content/aboutReader.html
+++ b/mobile/android/chrome/content/aboutReader.html
@@ -27,8 +27,7 @@
     <li><a id="toggle-button" class="button toggle-button" href="#"></a></li>
   </ul>
 
-  <script type="application/javascript;version=1.8" src="chrome://browser/content/aboutReader.js">
-  </script>
+  <script type="application/javascript;version=1.8" src="chrome://browser/content/aboutReader.js"></script>
 </body>
 
 </html>
diff --git a/mobile/android/chrome/content/aboutReader.js b/mobile/android/chrome/content/aboutReader.js
index dd710e7558d..e24d243a2fa 100644
--- a/mobile/android/chrome/content/aboutReader.js
+++ b/mobile/android/chrome/content/aboutReader.js
@@ -48,8 +48,6 @@ let AboutReader = {
 
     this._toolbarEnabled = false;
 
-    this._scrollOffset = window.pageYOffset;
-
     this._frame.contentDocument.addEventListener("DOMSubtreeModified", this, false);
     this._frame.contentDocument.addEventListener("MozScrolledAreaChanged", this, false);
     this._frame.contentDocument.addEventListener("touchstart", this, false);
@@ -146,7 +144,7 @@ let AboutReader = {
   uninit: function Reader_uninit() {
     dump("Uninit()");
 
-    Services.obs.removeObserver(this, "Reader:FaviconReturn", false);
+    Services.obs.removeObserver(this, "Reader:FaviconReturn");
 
     this._frame.contentDocument.removeEventListener("touchstart", this, false);
     this._frame.contentDocument.removeEventListener("click", this, false);
diff --git a/mobile/android/components/AboutRedirector.js b/mobile/android/components/AboutRedirector.js
index be4c492a3fe..1d9ceac8e5d 100644
--- a/mobile/android/components/AboutRedirector.js
+++ b/mobile/android/components/AboutRedirector.js
@@ -61,7 +61,8 @@ let modules = {
   },
   reader: {
     uri: "chrome://browser/content/aboutReader.html",
-    privileged: true
+    privileged: true,
+    hide: true
   },
   readercontent: {
     uri: "chrome://browser/content/aboutReaderContent.html",
diff --git a/mobile/android/themes/core/aboutReader.css b/mobile/android/themes/core/aboutReader.css
index c38e29e6f0e..6ae0711d70f 100644
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -2,9 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-%filter substitution
-%include defines.inc
-
 body {
   font-family: "OpenSansRegular","Droid Sans",sans-serif;
 }
@@ -24,7 +21,7 @@ body {
 
 .toolbar {
   font-family: "Droid Sans",helvetica,arial,clean,sans-serif;
-  -moz-transition-property: visibility opacity;
+  -moz-transition-property: visibility, opacity;
   -moz-transition-duration: 0.7s;
   visibility: visible;
   opacity: 1.0;
@@ -39,7 +36,7 @@ body {
 }
 
 .toolbar-hidden {
-  -moz-transition-property: visibility opacity;
+  -moz-transition-property: visibility, opacity;
   -moz-transition-duration: 0.7s;
   visibility: hidden;
   opacity: 0.0;
diff --git a/mobile/android/themes/core/jar.mn b/mobile/android/themes/core/jar.mn
index 038c2913ab2..6911f7b2cd7 100644
--- a/mobile/android/themes/core/jar.mn
+++ b/mobile/android/themes/core/jar.mn
@@ -11,7 +11,7 @@ chrome.jar:
   skin/aboutAddons.css                      (aboutAddons.css)
   skin/aboutApps.css                        (aboutApps.css)
 * skin/aboutDownloads.css                   (aboutDownloads.css)
-* skin/aboutReader.css                      (aboutReader.css)
+  skin/aboutReader.css                      (aboutReader.css)
   skin/aboutReaderContent.css               (aboutReaderContent.css)
 * skin/browser.css                          (browser.css)
 * skin/content.css                          (content.css)