Bug 1140340 - Add Reader Mode menu item to the menu bar. r=florian

--HG--
extra : rebase_source : 3c22f45081c84e99b96a919da6175fe35c1545b4
This commit is contained in:
Jared Wein 2015-03-20 17:35:55 -07:00
parent 0a6753444c
commit d2549c4e7a
4 changed files with 17 additions and 3 deletions

View File

@ -306,6 +306,9 @@
type="checkbox" type="checkbox"
observes="View:FullScreen"/> observes="View:FullScreen"/>
#endif #endif
<menuitem id="menu_readerModeItem"
observes="View:ReaderView"
hidden="true"/>
<menuitem id="menu_showAllTabs" <menuitem id="menu_showAllTabs"
hidden="true" hidden="true"
accesskey="&showAllTabsCmd.accesskey;" accesskey="&showAllTabsCmd.accesskey;"

View File

@ -41,6 +41,7 @@
<command id="View:PageSource" oncommand="BrowserViewSourceOfDocument(window.gBrowser.selectedBrowser.contentDocumentAsCPOW);" observes="isImage"/> <command id="View:PageSource" oncommand="BrowserViewSourceOfDocument(window.gBrowser.selectedBrowser.contentDocumentAsCPOW);" observes="isImage"/>
<command id="View:PageInfo" oncommand="BrowserPageInfo();"/> <command id="View:PageInfo" oncommand="BrowserPageInfo();"/>
<command id="View:FullScreen" oncommand="BrowserFullScreen();"/> <command id="View:FullScreen" oncommand="BrowserFullScreen();"/>
<command id="View:ReaderView" oncommand="ReaderParent.toggleReaderMode(event);"/>
<command id="cmd_find" <command id="cmd_find"
oncommand="gFindBar.onFindCommand();" oncommand="gFindBar.onFindCommand();"
observes="isImage"/> observes="isImage"/>

View File

@ -115,15 +115,23 @@ let ReaderParent = {
} }
let button = win.document.getElementById("reader-mode-button"); let button = win.document.getElementById("reader-mode-button");
let command = win.document.getElementById("View:ReaderView");
if (browser.currentURI.spec.startsWith("about:reader")) { if (browser.currentURI.spec.startsWith("about:reader")) {
button.setAttribute("readeractive", true); button.setAttribute("readeractive", true);
button.hidden = false; button.hidden = false;
button.setAttribute("tooltiptext", gStringBundle.GetStringFromName("readerView.close")); let closeText = gStringBundle.GetStringFromName("readerView.close");
button.setAttribute("tooltiptext", closeText);
command.setAttribute("label", closeText);
command.setAttribute("hidden", false);
} else { } else {
button.removeAttribute("readeractive"); button.removeAttribute("readeractive");
button.setAttribute("tooltiptext", gStringBundle.GetStringFromName("readerView.enter"));
button.hidden = !browser.isArticle; 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.accesskey"));
}, },
toggleReaderMode: function(event) { toggleReaderMode: function(event) {

View File

@ -28,6 +28,8 @@ aboutReader.toolbar.share=Share
aboutReader.footer.deleteThisArticle=Delete this article aboutReader.footer.deleteThisArticle=Delete this article
# Reader View toolbar button # These are used for the Reader View toolbar button and the menuitem within the
# View menu.
readerView.enter=Enter Reader View readerView.enter=Enter Reader View
readerView.close=Close Reader View readerView.close=Close Reader View
readerView.accesskey=R