Delta Between Two Patch Sets: popup.html
Issue 29532767:
Issue 5593 - Use messaging in popup for prefs, whitelisting, and stats (Closed)
Base URL: https://hg.adblockplus.org/adblockpluschrome/
Left Patch Set: Use messaging for prefs I/O
Created Aug. 31, 2017, 5:07 p.m.
Right Patch Set: Revert one more instance of ext.pages.open
Created Sept. 27, 2017, 9:40 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« notification.js ('k')
|
popup.js » ('j')
|
stats.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 <!DOCTYPE html> | 1 <!DOCTYPE html> |
| 2 | 2 |
| 3 <!-- | 3 <!-- |
| 4 - This file is part of Adblock Plus <https://adblockplus.org/>, | 4 - This file is part of Adblock Plus <https://adblockplus.org/>, |
| 5 - Copyright (C) 2006-present eyeo GmbH | 5 - Copyright (C) 2006-present eyeo GmbH |
| 6 - | 6 - |
| 7 - Adblock Plus is free software: you can redistribute it and/or modify | 7 - Adblock Plus is free software: you can redistribute it and/or modify |
| 8 - it under the terms of the GNU General Public License version 3 as | 8 - it under the terms of the GNU General Public License version 3 as |
| 9 - published by the Free Software Foundation. | 9 - published by the Free Software Foundation. |
| 10 - | 10 - |
| 11 - Adblock Plus is distributed in the hope that it will be useful, | 11 - Adblock Plus is distributed in the hope that it will be useful, |
| 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 - but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 13 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 14 - GNU General Public License for more details. | 14 - GNU General Public License for more details. |
| 15 - | 15 - |
| 16 - You should have received a copy of the GNU General Public License | 16 - You should have received a copy of the GNU General Public License |
| 17 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 17 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| 18 --> | 18 --> |
| 19 | 19 |
| 20 <html> | 20 <html> |
| 21 <head> | 21 <head> |
| 22 <meta charset="utf-8"> | 22 <meta charset="utf-8"> |
| 23 <link rel="stylesheet" type="text/css" href="skin/popup.css"> | 23 <link rel="stylesheet" type="text/css" href="skin/popup.css"> |
| 24 <script src="ext/common.js"></script> | 24 <script src="ext/common.js"></script> |
| 25 <script src="ext/content.js"></script> | 25 <script src="ext/content.js"></script> |
|
Wladimir Palant
2017/08/31 18:19:32
Do we need this? The messaging uses Chrome APIs di
Manish Jethani
2017/09/01 15:56:19
Right, it's not required. I've removed it now.
| |
| 26 <script src="ext/popup.js"></script> | 26 <script src="ext/popup.js"></script> |
| 27 <script src="i18n.js"></script> | 27 <script src="i18n.js"></script> |
| 28 <script src="popup.js"></script> | 28 <script src="popup.js"></script> |
| 29 <script src="notification.js"></script> | 29 <script src="notification.js"></script> |
| 30 <script src="stats.js"></script> | 30 <script src="stats.js"></script> |
| 31 </head> | 31 </head> |
| 32 <!-- Set tabindex to work around Chromium issue 304532 --> | 32 <!-- Set tabindex to work around Chromium issue 304532 --> |
| 33 <body tabindex="1"> | 33 <body class="nohtml" tabindex="1"> |
| 34 | 34 |
| 35 <header> | 35 <header> |
| 36 <img id="logo" src="icons/detailed/abp-64.png" srcset="icons/detailed/abp-128. png 2x"> | 36 <img id="logo" src="icons/detailed/abp-64.png" srcset="icons/detailed/abp-128. png 2x"> |
| 37 </header> | 37 </header> |
| 38 | 38 |
| 39 <div id="wrapper"> | 39 <div id="wrapper"> |
| 40 <div id="notification" hidden> | 40 <div id="notification" hidden> |
| 41 <div id="notification-content"> | 41 <div id="notification-content"> |
| 42 <h1> | 42 <h1> |
| 43 <span id="notification-title"></span> | 43 <span id="notification-title"></span> |
| (...skipping 20 matching lines...) Expand all Loading... | |
| 64 | 64 |
| 65 <li id="clickhide" class="menu-item" role="button"> | 65 <li id="clickhide" class="menu-item" role="button"> |
| 66 <div class="icon"></div> | 66 <div class="icon"></div> |
| 67 <span class="i18n_easy_create_filter"></span> | 67 <span class="i18n_easy_create_filter"></span> |
| 68 </li> | 68 </li> |
| 69 <li id="clickhide-cancel" class="menu-item" role="button"> | 69 <li id="clickhide-cancel" class="menu-item" role="button"> |
| 70 <div class="icon"></div> | 70 <div class="icon"></div> |
| 71 <span class="i18n_cancel"></span> | 71 <span class="i18n_cancel"></span> |
| 72 </li> | 72 </li> |
| 73 | 73 |
| 74 <li id="stats-container" class="collapsed"> | 74 <li id="stats-container" class="collapsed"> |
|
Manish Jethani
2017/08/31 17:12:21
Collapsed by default.
| |
| 75 <div class="menu-item collapse" data-option="show_statsinpopup" data-colla psible="stats-container" role="button"> | 75 <div class="menu-item collapse" data-option="show_statsinpopup" data-colla psible="stats-container" role="button"> |
| 76 <div class="icon"></div> | 76 <div class="icon"></div> |
| 77 <span class="i18n_stats_title"></span> | 77 <span class="i18n_stats_title"></span> |
| 78 <div class="collapse-icon-placeholder"></div> | 78 <div class="collapse-icon-placeholder"></div> |
| 79 <div class="collapse-icon"></div> | 79 <div class="collapse-icon"></div> |
| 80 </div> | 80 </div> |
| 81 <ul id="stats" class="collapsible"> | 81 <ul id="stats" class="collapsible"> |
|
Manish Jethani
2017/08/31 17:12:21
This has been renamed as per Thomas's suggestion,
| |
| 82 <li> | 82 <li> |
| 83 <div> | 83 <div> |
| 84 <div id="stats-page"></div> | 84 <div id="stats-page"></div> |
| 85 <div id="stats-total"></div> | 85 <div id="stats-total"></div> |
| 86 </div> | 86 </div> |
| 87 | 87 |
| 88 <div id="share"> | 88 <div id="share"> |
| 89 <span class="i18n_stats_share_title"></span> | 89 <span class="i18n_stats_share_title"></span> |
| 90 <div id="share-box"> | 90 <div id="share-box"> |
| 91 <div data-social="facebook"></div> | 91 <div data-social="facebook"></div> |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 103 </ul> | 103 </ul> |
| 104 </div> | 104 </div> |
| 105 | 105 |
| 106 <footer id="options" role="button"> | 106 <footer id="options" role="button"> |
| 107 <div class="icon"></div> | 107 <div class="icon"></div> |
| 108 <span class="i18n_options_short"></span> | 108 <span class="i18n_options_short"></span> |
| 109 </footer> | 109 </footer> |
| 110 | 110 |
| 111 </body> | 111 </body> |
| 112 </html> | 112 </html> |
| LEFT | RIGHT |
« notification.js ('k')
|
popup.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
