diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index cde27d597..562633628 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -323,6 +323,7 @@
#endif
#endif
+
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index f06398326..2f8283d96 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -5414,6 +5414,7 @@ const nodeToTooltipMap = {
"tabs-newtab-button": "newTabButton.tooltip",
"fullscreen-button": "fullscreenButton.tooltip",
"downloads-button": "downloads.tooltip",
+ "reader-mode-button": "reader-mode-button.tooltip",
};
const nodeToShortcutMap = {
"bookmarks-menu-button": "manBookmarkKb",
@@ -5421,7 +5422,8 @@ const nodeToShortcutMap = {
"new-tab-button": "key_newNavigatorTab",
"tabs-newtab-button": "key_newNavigatorTab",
"fullscreen-button": "key_fullScreen",
- "downloads-button": "key_openDownloads"
+ "downloads-button": "key_openDownloads",
+ "reader-mode-button": "key_toggleReaderMode",
};
//if (AppConstants.platform == "macosx") {
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index 9f0d550fa..cb86d4387 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -733,6 +733,7 @@
onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 3e7b7e1fa..668ffe583 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -105,6 +105,7 @@ These should match what Safari and other Apple applications use on OS X Lion. --
+
diff --git a/browser/locales/en-US/chrome/browser/browser.properties b/browser/locales/en-US/chrome/browser/browser.properties
index b98eef661..1512f76c5 100644
--- a/browser/locales/en-US/chrome/browser/browser.properties
+++ b/browser/locales/en-US/chrome/browser/browser.properties
@@ -291,6 +291,10 @@ tabHistory.goForward=Go forward to this page
# URL Bar
pasteAndGo.label=Paste & Go
+# LOCALIZATION NOTE (reader-mode-button.tooltip):
+# %S is the keyboard shortcut for entering/exiting reader view
+reader-mode-button.tooltip=Toggle reader view (%S)
+
# Block autorefresh
refreshBlocked.goButton=Allow
refreshBlocked.goButton.accesskey=A
diff --git a/browser/modules/ReaderParent.jsm b/browser/modules/ReaderParent.jsm
index 086098986..b3045791b 100644
--- a/browser/modules/ReaderParent.jsm
+++ b/browser/modules/ReaderParent.jsm
@@ -139,22 +139,23 @@ var ReaderParent = {
let button = win.document.getElementById("reader-mode-button");
let command = win.document.getElementById("View:ReaderView");
+ let key = win.document.getElementById("key_toggleReaderMode");
if (browser.currentURI.spec.startsWith("about:reader")) {
button.setAttribute("readeractive", true);
button.hidden = false;
let closeText = gStringBundle.GetStringFromName("readerView.close");
- button.setAttribute("tooltiptext", closeText);
command.setAttribute("label", closeText);
command.setAttribute("hidden", false);
command.setAttribute("accesskey", gStringBundle.GetStringFromName("readerView.close.accesskey"));
+ key.setAttribute("disabled", false);
} else {
button.removeAttribute("readeractive");
button.hidden = !browser.isArticle;
let enterText = gStringBundle.GetStringFromName("readerView.enter");
- button.setAttribute("tooltiptext", enterText);
command.setAttribute("label", enterText);
command.setAttribute("hidden", !browser.isArticle);
command.setAttribute("accesskey", gStringBundle.GetStringFromName("readerView.enter.accesskey"));
+ key.setAttribute("disabled", !browser.isArticle);
}
let currentUriHost = browser.currentURI && browser.currentURI.asciiHost;