From a0fd72c7acff704e1fb05f08903686799f49499e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Qu=C3=A8ze?= <florian@queze.net>
Date: Tue, 24 Mar 2015 23:44:28 +0100
Subject: [PATCH] Bug 1143388 - Loading an item from the readinglist shouldn't
 make the user leave the reader mode if it was active, r=jaws.

---
 browser/base/content/content.js           | 1 +
 browser/components/readinglist/sidebar.js | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/browser/base/content/content.js b/browser/base/content/content.js
index e8d2f768755a..10398ce2b6b9 100644
--- a/browser/base/content/content.js
+++ b/browser/base/content/content.js
@@ -519,6 +519,7 @@ let AboutReaderListener = {
           // Update the toolbar icon to show the "reader active" icon.
           sendAsyncMessage("Reader:UpdateReaderButton");
           new AboutReader(global, content, this._articlePromise);
+          this._articlePromise = null;
         }
         break;
 
diff --git a/browser/components/readinglist/sidebar.js b/browser/components/readinglist/sidebar.js
index e8d81cc3b2d8..c70bff8265b1 100644
--- a/browser/components/readinglist/sidebar.js
+++ b/browser/components/readinglist/sidebar.js
@@ -301,6 +301,11 @@ let RLSidebar = {
                            .rootTreeItem
                            .QueryInterface(Ci.nsIInterfaceRequestor)
                            .getInterface(Ci.nsIDOMWindow);
+
+    let currentUrl = mainWindow.gBrowser.currentURI.spec;
+    if (currentUrl.startsWith("about:reader"))
+      url = "about:reader?url=" + encodeURIComponent(url);
+
     mainWindow.openUILink(url, event);
   },
 
@@ -422,7 +427,7 @@ let RLSidebar = {
     } else if (event.keyCode == KeyEvent.DOM_VK_RETURN) {
       let selectedItem = this.selectedItem;
       if (selectedItem) {
-        this.activeItem = this.selectedItem;
+        this.activeItem = selectedItem;
         this.openActiveItem(event);
       }
     }