From 3a66695ff2a0ec28f90af05968a300cef2b0ee5d Mon Sep 17 00:00:00 2001 From: Margaret Leibovic Date: Mon, 22 Feb 2016 10:35:32 -0500 Subject: [PATCH] Bug 1226238 - (Part 4) Remove reading list toggle button from reader view. r=ahunt,Gijs MozReview-Commit-ID: 3pwOV5BjwC9 --HG-- extra : rebase_source : 66c2afd658320c5e5bd05e4b2a3278f2c871fee2 --- browser/modules/ReaderParent.jsm | 8 -- mobile/android/app/mobile.js | 3 - .../org/mozilla/gecko/ReadingListHelper.java | 51 +--------- mobile/android/chrome/content/Reader.js | 45 --------- mobile/android/chrome/content/browser.js | 5 +- .../themes/core/aboutReaderControls.css | 33 ------- .../images/reader-toggle-off-icon-hdpi.png | Bin 631 -> 0 bytes .../images/reader-toggle-off-icon-mdpi.png | Bin 461 -> 0 bytes .../images/reader-toggle-off-icon-xhdpi.png | Bin 738 -> 0 bytes .../images/reader-toggle-off-icon-xxhdpi.png | Bin 985 -> 0 bytes .../images/reader-toggle-on-icon-hdpi.png | Bin 238 -> 0 bytes .../images/reader-toggle-on-icon-mdpi.png | Bin 189 -> 0 bytes .../images/reader-toggle-on-icon-xhdpi.png | Bin 283 -> 0 bytes .../images/reader-toggle-on-icon-xxhdpi.png | Bin 387 -> 0 bytes mobile/android/themes/core/jar.mn | 8 -- toolkit/components/reader/AboutReader.jsm | 90 ------------------ .../reader/content/aboutReader.html | 1 - .../chrome/global/aboutReader.properties | 2 - toolkit/themes/shared/aboutReaderControls.css | 8 -- toolkit/themes/shared/jar.inc.mn | 2 - toolkit/themes/shared/reader/RM-Add-24x24.svg | 7 -- .../themes/shared/reader/RM-Delete-24x24.svg | 7 -- 22 files changed, 4 insertions(+), 266 deletions(-) delete mode 100644 mobile/android/themes/core/images/reader-toggle-off-icon-hdpi.png delete mode 100644 mobile/android/themes/core/images/reader-toggle-off-icon-mdpi.png delete mode 100644 mobile/android/themes/core/images/reader-toggle-off-icon-xhdpi.png delete mode 100644 mobile/android/themes/core/images/reader-toggle-off-icon-xxhdpi.png delete mode 100644 mobile/android/themes/core/images/reader-toggle-on-icon-hdpi.png delete mode 100644 mobile/android/themes/core/images/reader-toggle-on-icon-mdpi.png delete mode 100644 mobile/android/themes/core/images/reader-toggle-on-icon-xhdpi.png delete mode 100644 mobile/android/themes/core/images/reader-toggle-on-icon-xxhdpi.png delete mode 100644 toolkit/themes/shared/reader/RM-Add-24x24.svg delete mode 100644 toolkit/themes/shared/reader/RM-Delete-24x24.svg diff --git a/browser/modules/ReaderParent.jsm b/browser/modules/ReaderParent.jsm index e559fef48c03..24890d05c9f1 100644 --- a/browser/modules/ReaderParent.jsm +++ b/browser/modules/ReaderParent.jsm @@ -23,12 +23,8 @@ var ReaderParent = { _readerModeInfoPanelOpen: false, MESSAGES: [ - "Reader:AddToList", "Reader:ArticleGet", "Reader:FaviconRequest", - "Reader:ListStatusRequest", - "Reader:RemoveFromList", - "Reader:SystemUIVisibility", "Reader:UpdateReaderButton", "Reader:SetIntPref", "Reader:SetCharPref", @@ -72,10 +68,6 @@ var ReaderParent = { break; } - case "Reader:SystemUIVisibility": - // XXX: To implement. - break; - case "Reader:UpdateReaderButton": { let browser = message.target; if (message.data && message.data.isArticle !== undefined) { diff --git a/mobile/android/app/mobile.js b/mobile/android/app/mobile.js index 1a8101a25e97..c7c9b26d9086 100644 --- a/mobile/android/app/mobile.js +++ b/mobile/android/app/mobile.js @@ -928,9 +928,6 @@ pref("reader.color_scheme.values", "[\"dark\",\"auto\",\"light\"]"); // Whether to use a vertical or horizontal toolbar. pref("reader.toolbar.vertical", false); -// Whether or not to display buttons related to reading list in reader view. -pref("browser.readinglist.enabled", true); - // Telemetry settings. // Whether to use the unified telemetry behavior, requires a restart. pref("toolkit.telemetry.unified", false); diff --git a/mobile/android/base/java/org/mozilla/gecko/ReadingListHelper.java b/mobile/android/base/java/org/mozilla/gecko/ReadingListHelper.java index a768b252f922..fb90f2924929 100644 --- a/mobile/android/base/java/org/mozilla/gecko/ReadingListHelper.java +++ b/mobile/android/base/java/org/mozilla/gecko/ReadingListHelper.java @@ -53,7 +53,7 @@ public final class ReadingListHelper implements NativeEventListener { this.readingListAccessor = db.getReadingListAccessor(); EventDispatcher.getInstance().registerGeckoThreadListener((NativeEventListener) this, - "Reader:AddToList", "Reader:UpdateList", "Reader:FaviconRequest", "Reader:ListStatusRequest", "Reader:RemoveFromList"); + "Reader:AddToList", "Reader:UpdateList", "Reader:FaviconRequest"); contentObserver = new ContentObserver(null) { @@ -72,7 +72,7 @@ public final class ReadingListHelper implements NativeEventListener { public void uninit() { EventDispatcher.getInstance().unregisterGeckoThreadListener((NativeEventListener) this, - "Reader:AddToList", "Reader:UpdateList", "Reader:FaviconRequest", "Reader:ListStatusRequest", "Reader:RemoveFromList"); + "Reader:AddToList", "Reader:UpdateList", "Reader:FaviconRequest"); context.getContentResolver().unregisterContentObserver(contentObserver); } @@ -81,6 +81,7 @@ public final class ReadingListHelper implements NativeEventListener { public void handleMessage(final String event, final NativeJSObject message, final EventCallback callback) { switch(event) { + // Added from web context menu. case "Reader:AddToList": { handleAddToList(callback, message); break; @@ -93,14 +94,6 @@ public final class ReadingListHelper implements NativeEventListener { handleReaderModeFaviconRequest(callback, message.getString("url")); break; } - case "Reader:RemoveFromList": { - handleRemoveFromList(message.getString("url")); - break; - } - case "Reader:ListStatusRequest": { - handleReadingListStatusRequest(callback, message.getString("url")); - break; - } } } @@ -230,44 +223,6 @@ public final class ReadingListHelper implements NativeEventListener { }).execute(); } - /** - * A page can be removed from the ReadingList by panel context menu, - * or by tapping the readinglist-remove icon in the ReaderMode banner. - */ - private void handleRemoveFromList(final String url) { - ThreadUtils.postToBackgroundThread(new Runnable() { - @Override - public void run() { - readingListAccessor.removeReadingListItemWithURL(context.getContentResolver(), url); - handleEvent(ReadingListEvent.REMOVED, url); - } - }); - } - - /** - * Gecko (ReaderMode) requests the page ReadingList status, to display - * the proper ReaderMode banner icon (readinglist-add / readinglist-remove). - */ - private void handleReadingListStatusRequest(final EventCallback callback, final String url) { - ThreadUtils.postToBackgroundThread(new Runnable() { - @Override - public void run() { - final int inReadingList = readingListAccessor.isReadingListItem(context.getContentResolver(), url) ? 1 : 0; - - final JSONObject json = new JSONObject(); - try { - json.put("url", url); - json.put("inReadingList", inReadingList); - } catch (JSONException e) { - Log.e(LOGTAG, "JSON error - failed to return inReadingList status", e); - } - - // Return the json object to fulfill the promise. - callback.sendSuccess(json.toString()); - } - }); - } - /** * Handle various reading list events (and display appropriate toasts). */ diff --git a/mobile/android/chrome/content/Reader.js b/mobile/android/chrome/content/Reader.js index a67e82ddcb56..f184b433efeb 100644 --- a/mobile/android/chrome/content/Reader.js +++ b/mobile/android/chrome/content/Reader.js @@ -76,17 +76,8 @@ var Reader = { break; } - case "Reader:Added": { - let mm = window.getGroupMessageManager("browsers"); - mm.broadcastAsyncMessage("Reader:Added", { url: aData }); - break; - } - case "Reader:Removed": { ReaderMode.removeArticleFromCache(aData).catch(e => Cu.reportError("Error removing article from cache: " + e)); - - let mm = window.getGroupMessageManager("browsers"); - mm.broadcastAsyncMessage("Reader:Removed", { url: aData }); break; } } @@ -94,13 +85,6 @@ var Reader = { receiveMessage: function(message) { switch (message.name) { - case "Reader:AddToList": { - // If the article is coming from reader mode, we must have fetched it already. - let article = message.data.article; - article.status = this.STATUS_FETCHED_ARTICLE; - this._addArticleToReadingList(article); - break; - } case "Reader:ArticleGet": this._getArticle(message.data.url).then((article) => { // Make sure the target browser is still alive before trying to send data back. @@ -147,22 +131,6 @@ var Reader = { break; } - case "Reader:ListStatusRequest": - Messaging.sendRequestForResult({ - type: "Reader:ListStatusRequest", - url: message.data.url - }).then((data) => { - message.target.messageManager.sendAsyncMessage("Reader:ListStatusData", JSON.parse(data)); - }); - break; - - case "Reader:RemoveFromList": - Messaging.sendRequest({ - type: "Reader:RemoveFromList", - url: message.data.url - }); - break; - case "Reader:SystemUIVisibility": Messaging.sendRequest({ type: "SystemUI:Visibility", @@ -296,19 +264,6 @@ var Reader = { return article; }), - _addArticleToReadingList: function(article) { - Messaging.sendRequestForResult({ - type: "Reader:AddToList", - url: truncate(article.url, MAX_URI_LENGTH), - title: truncate(article.title, MAX_TITLE_LENGTH), - length: article.length, - excerpt: article.excerpt, - status: article.status, - }).then((url) => { - ReaderMode.storeArticleInCache(article).catch(e => Cu.reportError("Error storing article in cache: " + e)); - }).catch(Cu.reportError); - }, - /** * Gets an article for a given URL. This method will download and parse a document * if it does not find the article in the cache. diff --git a/mobile/android/chrome/content/browser.js b/mobile/android/chrome/content/browser.js index 0cdb4f64f5f1..ad032bcfcc11 100644 --- a/mobile/android/chrome/content/browser.js +++ b/mobile/android/chrome/content/browser.js @@ -155,7 +155,7 @@ var lazilyLoadedObserverScripts = [ ["Feedback", ["Feedback:Show"], "chrome://browser/content/Feedback.js"], ["SelectionHandler", ["TextSelection:Get"], "chrome://browser/content/SelectionHandler.js"], ["EmbedRT", ["GeckoView:ImportScript"], "chrome://browser/content/EmbedRT.js"], - ["Reader", ["Reader:FetchContent", "Reader:Added", "Reader:Removed"], "chrome://browser/content/Reader.js"], + ["Reader", ["Reader:FetchContent", "Reader:Removed"], "chrome://browser/content/Reader.js"], ["PrintHelper", ["Print:PDF"], "chrome://browser/content/PrintHelper.js"], ]; if (AppConstants.NIGHTLY_BUILD) { @@ -191,13 +191,10 @@ lazilyLoadedObserverScripts.forEach(function (aScript) { // Lazily-loaded browser scripts that use message listeners. [ ["Reader", [ - ["Reader:AddToList", false], ["Reader:ArticleGet", false], ["Reader:DropdownClosed", true], // 'true' allows us to survive mid-air cycle-collection. ["Reader:DropdownOpened", false], ["Reader:FaviconRequest", false], - ["Reader:ListStatusRequest", false], - ["Reader:RemoveFromList", false], ["Reader:ToolbarHidden", false], ["Reader:SystemUIVisibility", false], ["Reader:UpdateReaderButton", false], diff --git a/mobile/android/themes/core/aboutReaderControls.css b/mobile/android/themes/core/aboutReaderControls.css index e06fd6748a5c..ba14ff5c1f99 100644 --- a/mobile/android/themes/core/aboutReaderControls.css +++ b/mobile/android/themes/core/aboutReaderControls.css @@ -65,7 +65,6 @@ list-style: none; background-color: #EBEBF0; border-top: 1px solid #D7D9DB; - display: none; } .toolbar[visible] { @@ -244,14 +243,6 @@ display: none; } -.toggle-button.on { - background-image: url('chrome://browser/skin/images/reader-toggle-on-icon-mdpi.png'); -} - -.toggle-button { - background-image: url('chrome://browser/skin/images/reader-toggle-off-icon-mdpi.png'); -} - .style-button { background-image: url('chrome://browser/skin/images/reader-style-icon-mdpi.png'); } @@ -269,14 +260,6 @@ } @media screen and (min-resolution: 1.25dppx) { - .toggle-button.on { - background-image: url('chrome://browser/skin/images/reader-toggle-on-icon-hdpi.png'); - } - - .toggle-button { - background-image: url('chrome://browser/skin/images/reader-toggle-off-icon-hdpi.png'); - } - .style-button { background-image: url('chrome://browser/skin/images/reader-style-icon-hdpi.png'); } @@ -295,14 +278,6 @@ } @media screen and (min-resolution: 2dppx) { - .toggle-button.on { - background-image: url('chrome://browser/skin/images/reader-toggle-on-icon-xhdpi.png'); - } - - .toggle-button { - background-image: url('chrome://browser/skin/images/reader-toggle-off-icon-xhdpi.png'); - } - .style-button { background-image: url('chrome://browser/skin/images/reader-style-icon-xhdpi.png'); } @@ -321,14 +296,6 @@ } @media screen and (min-resolution: 3dppx) { - .toggle-button.on { - background-image: url('chrome://browser/skin/images/reader-toggle-on-icon-xxhdpi.png'); - } - - .toggle-button { - background-image: url('chrome://browser/skin/images/reader-toggle-off-icon-xxhdpi.png'); - } - .style-button { background-image: url('chrome://browser/skin/images/reader-style-icon-xxhdpi.png'); } diff --git a/mobile/android/themes/core/images/reader-toggle-off-icon-hdpi.png b/mobile/android/themes/core/images/reader-toggle-off-icon-hdpi.png deleted file mode 100644 index 90402468bfe34e16eb245d6d0f55d3f921bc32cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 631 zcmV--0*L*IP)o+w?52$ykGLH_ub!O zRw7A3#L+yLw0Ta-%n^A7Qv6nG^BH}SSAZ~rh(GX`qu7u#yQMZKVhJhUPnx$#mnRUJ z%EE`^glb9|YHd|oYMzXR?1kS+mtE8*9ae->uEN8tN|WOISjcid29(K?ieF=#$gB4K z*~NTPX1YKA8sE<&mjhVOzjp~uN=iym;RC|4)WLc`l_qW0lJdq!7c)~T-b{**|4>iy zryf0e{40Fms9BZH3Whp}I0z_iPMR;E7W$;TEB}^KmqA&vxlR(DZQJP_IamlA=qA7_cpkd2b?aBtafv|1q8?q|F?>FyX~1 zc4=i+;1(E3vRrN?vH{%le=eO%$;j}^NNo=18EM=UNSkYL{L|&Jm|R{SNiu?7gM?fT zu3MIr+2(h&+z{;pAJos^(qBdTI&QdsBtav|71G&7Qks)}B`20-zBL-{*|2e*9K7`T7 zxb44JLMlFo5!)f{txrT<_zFA}{11^_o;UCnfGAv#6pwXWo)t@Q&Hm|(VLq0NbsO-5 zr?5>xdxNFs$9`FiW4g%A;I}Smz5-$NF)s1~0oQ9q%Dh5f002ovPDHLkV1gx!Clvqy diff --git a/mobile/android/themes/core/images/reader-toggle-off-icon-mdpi.png b/mobile/android/themes/core/images/reader-toggle-off-icon-mdpi.png deleted file mode 100644 index fd8f4b206aa9e4e12aab21c95584b708d38f7b41..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 461 zcmV;;0W$uHP)m`MdmUZv>fMvL_lUC1GS4&Yn8HA42&m6bjwabi+s_ zvB2&jvOK`d?bNjxu@+lc>7c@kIFU1^z+dS;;tsM+gj#Pd%}?20pxCcb^R>{ zsxL#5dp@+dn&s)XP&>tob^MvEzR-*2xh2Fcm*argkjw^>BR;CkV>(xk+e8fHE`^aZ zkhv{|LZPRkpY^xKob`&MAUUYyJ)iuTB&~@$6U6!?BzFo(t_ESb2IOA;=c1Ro)|flg zrOqTa^j{^gJN!ecpY^w-wF1c+{!1 diff --git a/mobile/android/themes/core/images/reader-toggle-off-icon-xhdpi.png b/mobile/android/themes/core/images/reader-toggle-off-icon-xhdpi.png deleted file mode 100644 index 8b57ad9fb0a4247c7b4553c9c84b8396963cc772..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 738 zcmV<80v-K{P)3OF00081NklFELmC#D-y+k@#hkeC|)r`JNxgd9!@6nQUWmxflsZ39!Yz-e_0=pa2%1 zQz&(ER&0_EbLB@YGi}*l2{0phMh$G%S^tyPop3Q8<;?kUj?=Q>_N9)@%EkeVZF5~c zHi-}FfU_EL+xNYk^M*K1&EmSAvOwp*EMn)_1LNp3S8gt|NglCXdBrCArnpAok}hgA zRTfy>7R3O|&Ea<;Vh|&-GjA-5#1`K@6m&~!fpcbNAN~h=hMXBYvcQn#igiBp5|k?h z@HnD+mSxq60I&k70A^gyWUe?6$m9)G^>`Q>FzP|O1th7EIrELevPM%;0uCSz%(!Ql z2skdzZJfw?yC6=>#<5o=i;LA@D;zi?N_1pLBu{Wf8W>}9o5Ti2;yaj11#FsTeao_% z2XWR@kSZ0Echo1X*aK@|4Qz8ckGbMR5Sy+T{vQD=ka}PZtbx@RIsclsN>MX5+HLwP*6pBl)P~w&XI9%hu5#M+H^4@}8%3~fQu@CEn z{f~(X;NnekeI_i*s^c4sbPL_fyGAkXIXrJl>_^%MqHfNfVuJ}W<=Rw z1Z&nGcsBQ@rDZk}hr%#(#bJMX)erWq6b<`^ZLob<1{2u8Xs8h0Y1>>ZWF+4e28v}^ z2kRP9Q6f=moV~oTn1^LX6on6KjO3|ISd=l(h_dj_2bVC6vQZIalZ=Or(50pI52Twc U^Ghk>m;e9(07*qoM6N<$f~@IM;s5{u diff --git a/mobile/android/themes/core/images/reader-toggle-off-icon-xxhdpi.png b/mobile/android/themes/core/images/reader-toggle-off-icon-xxhdpi.png deleted file mode 100644 index f3228599d381fc946bfabf6ea827bb8b7be79049..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 985 zcmeAS@N?(olHy`uVBq!ia0vp^Q9vBR!3-o#Yc4o2Ffh6V_=LCuxj+ya8tUNSU~HTQ zWO#ad#>U118GcDgp`mF32??R0$v~0F$ds6vw1}jnh{VLG-V33X(#vS0;BP!r;B4q1>@UmPbb|m5O96C z`wR#i7CvWW-2CqM|NiWo(NW8npOXFZo#FV6Ngv`*bIHoLZ(5+};?5z}_tK(`?H>1~ z|7p9jG`^iY-2S1Y-Zbvylx4=x^L`fZHvYL|y8YJ6>b~{M&YY~>_`4&g()8|@UGpoy z1f1$&YHmxJn!W3-6T`mXH>(zXoYg0Dz2vqm^Nr zUK3V*QFRW#Wj-}~iPtWRGT*5sZ?8)SsoOe6U4A;%tkrG_t9|^0f83Y44QJcQUt+3v zwDMTL=628jSY_cQ{O5C>4xZQ}x}^Ebt2yl__X*i(znnei^M+Sm+%vZF-FY2hJcV(o zj}EU#cQDU%5pO2XuGpmJqP=^k+&;kcl#fqid&3>uRX0wv&f;J3V1Z=cpA*+iYfJZv zo;<$zOAdeK*T=I!dy7MGM3 zo0uM#oF1Q?9+#8>WW*(<#{(Hj84!_pAU8RK?RxzmkSQfWe!&b9{sFahi#Kh4_~hx! z58u9rz3Qw4%0+p)IEGX(zCGv6bi_fx;o`Q^|EK-lYze#g=c{&uw0q8r&08228?=9# zr912C)|f3lN;ys@&EKQiU9#4P#$B)f^uuXO`iuSlUhn^A_~!hUj?BVkisk9o3OVv3 Zm^I`KQmynQ9|LV+@O1TaS?83{1ORT4T~7c2 diff --git a/mobile/android/themes/core/images/reader-toggle-on-icon-mdpi.png b/mobile/android/themes/core/images/reader-toggle-on-icon-mdpi.png deleted file mode 100644 index b1991ac54b7ecab9dfeff755c69cc1595e1802e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^azHG@!3HGDe()_&;Jt=Dr}P$&pcXqQqo&-T4K@!nYTKAUiD3zyvHmEVEFhy}+6i~AC^`9)+bs-rRqZtY l+OC||^rhj8(ri;M2H*0nm9t*-Gy~nk;OXk;vd$@?2>@z;MiT%4 diff --git a/mobile/android/themes/core/images/reader-toggle-on-icon-xhdpi.png b/mobile/android/themes/core/images/reader-toggle-on-icon-xhdpi.png deleted file mode 100644 index 109e3571aa2fcb97235b74a3931c54ec8a4f0052..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 283 zcmeAS@N?(olHy`uVBq!ia0vp^Hb88_!3-p)ZO#q@QceLrA+A6=G&IyNDJeEFB`z^N zHaRUmDI+c^Js!-62Qre$B+ufw-=5w9cJKQzHlY>`k(*n-(A}2@O)A^ zyO4sk*|2>;;0xWCWcDp_HTn^jL}N3iN#uQ^gLOzxQ0gunSM z_pQ!pa+_(+r44PmQrAAX9OjyCYGSfOXQARTQO|1CpI4UssLr0%UEnx-&-xso^$eb_ KelF{r5}E)$yP9|loy!Xc<1iDXD?oV`1s@JzYm7XZGdXmd%8G= zR4~51bTyILP@v_ZWt!1#_F4Z{pUJjp+VEWa!S!`2EW#(t!|e+1KK&uG^&$7NgX$VQ z@rhh5)*nKvS-O9;aV+%Ox6oz9wEPUgS7*%UJk*fP|579^yhl6kMQ-26d5w&0d!8R+ zm_FaD{$cBp&(m#{Cuu(Td{ { - this._mm.removeMessageListener("Reader:ListStatusData", handleListStatusData); - - let args = message.data; - if (args.url == this._article.url) { - if (this._isReadingListItem != args.inReadingList) { - let isInitialStateChange = (this._isReadingListItem == -1); - this._isReadingListItem = args.inReadingList; - this._updateToggleButton(); - - // Display the toolbar when all its initial component states are known - if (isInitialStateChange) { - // Toolbar display is updated here to avoid it appearing in the middle of the screen on page load. See bug 1145567. - this._win.setTimeout(() => { - this._toolbarElement.style.display = "block"; - // Delay showing the toolbar to have a nice slide from bottom animation. - this._win.setTimeout(() => this._setToolbarVisibility(true), 200); - }, 500); - } - } - } - }; - - this._mm.addMessageListener("Reader:ListStatusData", handleListStatusData); - this._mm.sendAsyncMessage("Reader:ListStatusRequest", { url: this._article.url }); - }, - _onReaderClose: function() { this._win.location.href = this._getOriginalUrl(); }, - _onReaderToggle: function(aMethod) { - if (!this._article) - return; - - if (this._isReadingListItem == 0) { - this._mm.sendAsyncMessage("Reader:AddToList", { article: this._article }); - UITelemetry.addEvent("save.1", aMethod, null, "reading_list"); - } else { - this._mm.sendAsyncMessage("Reader:RemoveFromList", { url: this._article.url }); - UITelemetry.addEvent("unsave.1", aMethod, null, "reading_list"); - } - }, - _setFontSize: function(newFontSize) { let containerClasses = this._doc.getElementById("container").classList; @@ -712,7 +623,6 @@ AboutReader.prototype = { this._contentElement.style.display = "block"; this._updateImageMargins(); - this._requestReadingListStatus(); this._requestFavicon(); this._doc.body.classList.add("loaded"); diff --git a/toolkit/components/reader/content/aboutReader.html b/toolkit/components/reader/content/aboutReader.html index 31cba5326b09..bfd53b0cb55f 100644 --- a/toolkit/components/reader/content/aboutReader.html +++ b/toolkit/components/reader/content/aboutReader.html @@ -57,7 +57,6 @@
-
    • diff --git a/toolkit/locales/en-US/chrome/global/aboutReader.properties b/toolkit/locales/en-US/chrome/global/aboutReader.properties index 7eeda1b669cf..8826630c2516 100644 --- a/toolkit/locales/en-US/chrome/global/aboutReader.properties +++ b/toolkit/locales/en-US/chrome/global/aboutReader.properties @@ -23,8 +23,6 @@ aboutReader.fontTypeSample=Aa aboutReader.toolbar.close=Close Reader View aboutReader.toolbar.typeControls=Type controls -aboutReader.toolbar.addToReadingList=Add to Reading List -aboutReader.toolbar.removeFromReadingList=Remove from Reading List # These are used for the Reader View toolbar button and the menuitem within the # View menu. diff --git a/toolkit/themes/shared/aboutReaderControls.css b/toolkit/themes/shared/aboutReaderControls.css index b4956ac3fbd6..a666637c3d78 100644 --- a/toolkit/themes/shared/aboutReaderControls.css +++ b/toolkit/themes/shared/aboutReaderControls.css @@ -326,14 +326,6 @@ background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg"); } -.toggle-button.on { - background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg"); -} - -.toggle-button { - background-image: url("chrome://global/skin/reader/RM-Add-24x24.svg"); -} - .minus-button { background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg"); } diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn index b7769ed3b875..688c23705e6d 100644 --- a/toolkit/themes/shared/jar.inc.mn +++ b/toolkit/themes/shared/jar.inc.mn @@ -36,9 +36,7 @@ toolkit.jar: skin/classic/global/in-content/dropdown.svg (../../shared/in-content/dropdown.svg) skin/classic/global/in-content/help-glyph.svg (../../shared/in-content/help-glyph.svg) skin/classic/global/in-content/radio.svg (../../shared/in-content/radio.svg) - skin/classic/global/reader/RM-Add-24x24.svg (../../shared/reader/RM-Add-24x24.svg) skin/classic/global/reader/RM-Close-24x24.svg (../../shared/reader/RM-Close-24x24.svg) - skin/classic/global/reader/RM-Delete-24x24.svg (../../shared/reader/RM-Delete-24x24.svg) skin/classic/global/reader/RM-Minus-24x24.svg (../../shared/reader/RM-Minus-24x24.svg) skin/classic/global/reader/RM-Plus-24x24.svg (../../shared/reader/RM-Plus-24x24.svg) skin/classic/global/reader/RM-Type-Controls-24x24.svg (../../shared/reader/RM-Type-Controls-24x24.svg) diff --git a/toolkit/themes/shared/reader/RM-Add-24x24.svg b/toolkit/themes/shared/reader/RM-Add-24x24.svg deleted file mode 100644 index 20713815651f..000000000000 --- a/toolkit/themes/shared/reader/RM-Add-24x24.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/toolkit/themes/shared/reader/RM-Delete-24x24.svg b/toolkit/themes/shared/reader/RM-Delete-24x24.svg deleted file mode 100644 index 0ed398307bf2..000000000000 --- a/toolkit/themes/shared/reader/RM-Delete-24x24.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - -