Bug 778582 - Part 4. r=lucasr
authorBrian Nicholson <bnicholson@mozilla.com>
Thu, 23 Aug 2012 00:06:17 -0700
changeset 105316 ee35e4c5e26c8c4533bfde4f7ea3c27d1c48c2e6
parent 105315 726f7f71fd458c1f8bb7b5df019a95e30ea7a28a
child 105317 3559149341e06348c44fd450c1f4cebf40b1b921
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewerslucasr
bugs778582
milestone17.0a1
Bug 778582 - Part 4. r=lucasr
mobile/android/chrome/content/aboutReader.html
mobile/android/chrome/content/aboutReader.js
mobile/android/components/AboutRedirector.js
mobile/android/themes/core/aboutReader.css
mobile/android/themes/core/jar.mn
--- a/mobile/android/chrome/content/aboutReader.html
+++ b/mobile/android/chrome/content/aboutReader.html
@@ -22,13 +22,12 @@
         <hr></hr>
         <div id="margin-size-control" class="step-control"></div>
       </li>
     </ul>
     <li><a id="list-button" class="button list-button" href="#"></a></li>
     <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>
--- a/mobile/android/chrome/content/aboutReader.js
+++ b/mobile/android/chrome/content/aboutReader.js
@@ -43,18 +43,16 @@ let AboutReader = {
     this._headerElement = this._frame.contentDocument.getElementById("reader-header");
     this._domainElement = this._frame.contentDocument.getElementById("reader-domain");
     this._creditsElement = this._frame.contentDocument.getElementById("reader-credits");
     this._contentElement = this._frame.contentDocument.getElementById("reader-content");
     this._toolbarElement = document.getElementById("reader-toolbar");
 
     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);
     this._frame.contentDocument.addEventListener("click", this, false);
     window.addEventListener("scroll", this, false);
     window.addEventListener("popstate", this, false);
     window.addEventListener("resize", this, false);
 
@@ -141,17 +139,17 @@ let AboutReader = {
         }
         break;
     }
   },
 
   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);
     this._frame.contentDocument.removeEventListener("DOMSubtreeModified", this, false);
     this._frame.contentDocument.removeEventListener("MozScrolledAreaChanged", this, false);
     window.removeEventListener("scroll", this, false);
     window.removeEventListener("popstate", this, false);
     window.removeEventListener("resize", this, false);
--- a/mobile/android/components/AboutRedirector.js
+++ b/mobile/android/components/AboutRedirector.js
@@ -56,17 +56,18 @@ let modules = {
     privileged: true
   },
   downloads: {
     uri: "chrome://browser/content/aboutDownloads.xhtml",
     privileged: true
   },
   reader: {
     uri: "chrome://browser/content/aboutReader.html",
-    privileged: true
+    privileged: true,
+    hide: true
   },
   readercontent: {
     uri: "chrome://browser/content/aboutReaderContent.html",
     privileged: false,
     hide: true
   }
 }
 
--- a/mobile/android/themes/core/aboutReader.css
+++ b/mobile/android/themes/core/aboutReader.css
@@ -1,15 +1,12 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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;
 }
 
 #frame {
   border: 0;
   width: 100%;
 }
@@ -19,32 +16,32 @@ body {
 }
 
 .dark {
   background-color: #000000;
 }
 
 .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;
   position: fixed;
   width: 100%;
   bottom: 0px;
   left: 0px;
   margin: 0;
   padding: 0;
   list-style: none;
   background-repeat: repeat;
 }
 
 .toolbar-hidden {
-  -moz-transition-property: visibility opacity;
+  -moz-transition-property: visibility, opacity;
   -moz-transition-duration: 0.7s;
   visibility: hidden;
   opacity: 0.0;
 }
 
 .toolbar > * {
   float: right;
   width: 25%;
--- a/mobile/android/themes/core/jar.mn
+++ b/mobile/android/themes/core/jar.mn
@@ -6,17 +6,17 @@
 
 chrome.jar:
 % skin browser classic/1.0 %skin/
   skin/aboutPage.css                        (aboutPage.css)
   skin/about.css                            (about.css)
   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)
   skin/config.css                           (config.css)
   skin/touchcontrols.css                    (touchcontrols.css)
   skin/netError.css                         (netError.css)
 % override chrome://global/skin/about.css chrome://browser/skin/about.css
 % override chrome://global/skin/media/videocontrols.css chrome://browser/skin/touchcontrols.css