Delta Between Two Patch Sets: options.html
Issue 29333819:
Issue 2375 - Implement "Blocking lists" section in new options page (Closed)
Left Patch Set: Small fixes and improved download messages for filter lists
Created Feb. 3, 2016, 5:41 p.m.
Right Patch Set: Fixed the progress indicator and small fixes
Created Feb. 4, 2016, 5:43 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« background.js ('K')
|
« messageResponder.js ('k')
|
options.js » ('j')
|
no next file with change/comment »
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 - This file is part of Adblock Plus <https://adblockplus.org/>, | 3 - This file is part of Adblock Plus <https://adblockplus.org/>, |
| 4 - Copyright (C) 2006-2016 Eyeo GmbH | 4 - Copyright (C) 2006-2016 Eyeo GmbH |
| 5 - | 5 - |
| 6 - Adblock Plus is free software: you can redistribute it and/or modify | 6 - Adblock Plus is free software: you can redistribute it and/or modify |
| 7 - it under the terms of the GNU General Public License version 3 as | 7 - it under the terms of the GNU General Public License version 3 as |
| 8 - published by the Free Software Foundation. | 8 - published by the Free Software Foundation. |
| 9 - | 9 - |
| 10 - Adblock Plus is distributed in the hope that it will be useful, | 10 - Adblock Plus is distributed in the hope that it will be useful, |
| (...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 250 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a> | 250 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a> |
| 251 <a class="i18n_options_filterList_website website" t arget="_blank"></a> | 251 <a class="i18n_options_filterList_website website" t arget="_blank"></a> |
| 252 <a class="i18n_options_filterList_source source" tar get="_blank"></a> | 252 <a class="i18n_options_filterList_source source" tar get="_blank"></a> |
| 253 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a> | 253 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a> |
| 254 </div> | 254 </div> |
| 255 </div> | 255 </div> |
| 256 </div> | 256 </div> |
| 257 </div> | 257 </div> |
| 258 <span class="date"></span> | 258 <span class="date"></span> |
| 259 <span class="time"></span> | 259 <span class="time"></span> |
| 260 <span class="error">error</span> | 260 <span class="message"></span> |
| 261 <span class="progress">progress</span> | |
|
Thomas Greiner
2016/02/04 15:28:16
We don't intend to show both at the same time so w
| |
| 262 </template> | 261 </template> |
| 263 <li class="static"> | 262 <li class="static"> |
| 264 <button role="checkbox" class="control" aria-checked="true" disabled="true"></button> | 263 <button role="checkbox" class="control" aria-checked="true" disabled="true"></button> |
| 265 <div> | 264 <div> |
| 266 <span class="i18n_options_filterList_own_list"></span> | 265 <span class="i18n_options_filterList_own_list"></span> |
| 267 </div> | 266 </div> |
| 268 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters"> | 267 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters"> |
| 269 <a class="i18n_options_filterList_edit_own_list"></a> | 268 <a class="i18n_options_filterList_edit_own_list"></a> |
| 270 </span> | 269 </span> |
| 271 </li> | 270 </li> |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 398 <div class="url"></div> | 397 <div class="url"></div> |
| 399 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 398 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 400 </div> | 399 </div> |
| 401 </div> | 400 </div> |
| 402 </div> | 401 </div> |
| 403 <!-- Placeholder element to determine when to wrap focus around --> | 402 <!-- Placeholder element to determine when to wrap focus around --> |
| 404 <span class="focus-last" tabindex="0"></span> | 403 <span class="focus-last" tabindex="0"></span> |
| 405 </div> | 404 </div> |
| 406 </body> | 405 </body> |
| 407 </html> | 406 </html> |
| LEFT | RIGHT |
« messageResponder.js ('k')
|
options.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
