desktop-options.html - Issue 29712664: Issue 6432 - Hide remove button for additional filter lists

Side by Side Diff: desktop-options.html

Issue 29712664: Issue 6432 - Hide remove button for additional filter lists (Closed)

Patch Set: Addressed Jeen's suggestion in the ticket Created March 2, 2018, 4:31 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
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-present eyeo GmbH	4 - Copyright (C) 2006-present 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 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 <!-- General tab content -->	79 <!-- General tab content -->

80 <div id="content-general" role="tabpanel" aria-labelledby="tab-general">	80 <div id="content-general" role="tabpanel" aria-labelledby="tab-general">

81 <header>	81 <header>

82 <h1 class="i18n_options_tab_general"></h1>	82 <h1 class="i18n_options_tab_general"></h1>

83 <p class="i18n_options_general_description"></p>	83 <p class="i18n_options_general_description"></p>

84 </header>	84 </header>

85 <section class="cols">	85 <section class="cols">

86 <h2 class="i18n_options_privacy_header"></h2>	86 <h2 class="i18n_options_privacy_header"></h2>

87 <ul class="list" id="recommend-protection-list-table">	87 <ul class="list" id="recommend-protection-list-table">

88 <template>	88 <template>

89 <button data-action="toggle-remove-subscription" role="checkbox" c lass="control icon"></button>	89 <button data-preconfigured="hide" data-action="toggle-remove-subsc ription" role="checkbox" class="control icon"></button>
	Thomas Greiner 2018/03/02 17:00:02 As I mentioned, let's focus on fixing this regress As I mentioned, let's focus on fixing this regression and not make any further changes at this point. saroyanm 2018/03/02 17:36:32 I'm not sure why this comment is located here. The Show quoted text On 2018/03/02 17:00:02, Thomas Greiner wrote: > As I mentioned, let's focus on fixing this regression and not make any further > changes at this point. I'm not sure why this comment is located here. The only non regression change I think is the introduction of the grey Icon and small changes in the background page, but I assume you are referring to some other change here ? Thomas Greiner 2018/03/05 14:52:10 What about reversing that and instead write `data- What about reversing that and instead write `data-hide="preconfigured"`? That way we could reuse the attribute for hiding elements using other conditions in the future (e.g. `data-hide="weekend"` to hide elements only on weekends). saroyanm 2018/03/06 15:09:52 Done. Show quoted text On 2018/03/05 14:52:10, Thomas Greiner wrote: > What about reversing that and instead write `data-hide="preconfigured"`? That > way we could reuse the attribute for hiding elements using other conditions in > the future (e.g. `data-hide="weekend"` to hide elements only on weekends). Done.
	90 <button data-preconfigured="show" role="checkbox" class="control i con" disabled></button>
	Thomas Greiner 2018/03/05 14:52:10 This button is redundant because we could simply s This button is redundant because we could simply set the existing button to disabled when we initialize this collection. The browser should then no longer trigger any of its actions. That way we'd no longer need to - keep this button in sync with the other one - introduce `data-preconfigured="show"` - use `display: none !important` to hide one of the two buttons I'd recommend also setting `cursor: default` on disabled elements for a more consistent UX. saroyanm 2018/03/06 15:09:52 Done. Show quoted text On 2018/03/05 14:52:10, Thomas Greiner wrote: > This button is redundant because we could simply set the existing button to > disabled when we initialize this collection. The browser should then no longer > trigger any of its actions. > > That way we'd no longer need to > - keep this button in sync with the other one > - introduce `data-preconfigured="show"` > - use `display: none !important` to hide one of the two buttons > > I'd recommend also setting `cursor: default` on disabled elements for a more > consistent UX. Done.
90 <span data-display="title"></span>	91 <span data-display="title"></span>

91 <span data-tooltip="options_protection_%value%_tooltip"></span>	92 <span data-tooltip="options_protection_%value%_tooltip"></span>

92 </template>	93 </template>

93 </ul>	94 </ul>

94 </section>	95 </section>

95 <section class="cols">	96 <section class="cols">

96 <header>	97 <header>

97 <h2 class="i18n_options_acceptableAds_header"></h2>	98 <h2 class="i18n_options_acceptableAds_header"></h2>

98 <p class="i18n_options_acceptableAds_description"></p>	99 <p class="i18n_options_acceptableAds_description"></p>

99 </header>	100 </header>

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
134 </header>	135 </header>

135 <div id="blocking-languages">	136 <div id="blocking-languages">

136 <ul id="blocking-languages-table" class="table list bottom-control">	137 <ul id="blocking-languages-table" class="table list bottom-control">

137 <template>	138 <template>

138 <span>	139 <span>

139 <span data-display="title"></span>	140 <span data-display="title"></span>

140 <span class="dimmed">	141 <span class="dimmed">

141 (<span data-display="originalTitle"></span>)	142 (<span data-display="originalTitle"></span>)

142 </span>	143 </span>

143 </span>	144 </span>

144 <button data-single="hidden" data-action="remove-subscription" c lass="icon delete control" title="options_control_remove_title"></button>	145 <button data-single="hidden" data-preconfigured="hide" data-acti on="remove-subscription" class="icon delete control" title="options_control_remo ve_title"></button>

145 <button data-single="visible" data-action="open-dialog" data-dia log="language-change" class="i18n_options_language_change link"></button>	146 <button data-single="visible" data-preconfigured="hide" data-act ion="open-dialog" data-dialog="language-change" class="i18n_options_language_cha nge link"></button>

146 </template>	147 </template>

147 </ul>	148 </ul>

148 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button>	149 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button>

149 <p class="i18n_options_language_tip"></p>	150 <p class="i18n_options_language_tip"></p>

150 </div>	151 </div>

151 </section>	152 </section>

152 <section id="more-filters" class="cols">	153 <section id="more-filters" class="cols">

153 <header>	154 <header>

154 <h2 class="i18n_options_more_filters_header"></h2>	155 <h2 class="i18n_options_more_filters_header"></h2>

155 <p class="i18n_options_more_filters_description"></p>	156 <p class="i18n_options_more_filters_description"></p>

156 </header>	157 </header>

157 <div>	158 <div>

158 <ul id="more-list-table" class="table list">	159 <ul id="more-list-table" class="table list">

159 <template>	160 <template>

160 <span data-display="title"></span>	161 <span data-display="title"></span>

161 <button data-action="remove-subscription" class="i18n_options_co ntrol_remove_title link control" title="options_control_remove_title"></button>	162 <button data-preconfigured="hide" data-action="remove-subscripti on" class="i18n_options_control_remove_title link control" title="options_contro l_remove_title"></button>

162 </template>	163 </template>

163 </ul>	164 </ul>

164 <p class="i18n_options_more_filters_note"></p>	165 <p class="i18n_options_more_filters_note"></p>

165 </div>	166 </div>

166 </section>	167 </section>

167 </div>	168 </div>

168	169

169 <!-- Whitelist tab content -->	170 <!-- Whitelist tab content -->

170 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist ">	171 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist ">

171 <header>	172 <header>

(...skipping 90 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
262 <li role="menuitem">	263 <li role="menuitem">

263 <button class="i18n_options_filterList_updateNow icon up date-subscription" data-action="update-subscription"></button>	264 <button class="i18n_options_filterList_updateNow icon up date-subscription" data-action="update-subscription"></button>

264 </li>	265 </li>

265 <li role="menuitem">	266 <li role="menuitem">

266 <a class="i18n_options_filterList_website icon website" target="_blank"></a>	267 <a class="i18n_options_filterList_website icon website" target="_blank"></a>

267 </li>	268 </li>

268 <li role="menuitem">	269 <li role="menuitem">

269 <a class="i18n_options_filterList_source icon source" ta rget="_blank"></a>	270 <a class="i18n_options_filterList_source icon source" ta rget="_blank"></a>

270 </li>	271 </li>

271 <li role="menuitem">	272 <li role="menuitem">

272 <button class="i18n_options_control_remove_title icon de lete" data-action="remove-subscription"></button>	273 <button class="i18n_options_control_remove_title icon de lete" data-preconfigured="hide" data-action="remove-subscription"></button>

273 </li>	274 </li>

274 </ul>	275 </ul>

275 </div>	276 </div>

276 </div>	277 </div>

277 </div>	278 </div>

278 <div class="col5">	279 <div class="col5">

279 <button data-action="remove-subscription" class="control icon de lete"></button>	280 <button data-preconfigured="hide" data-action="remove-subscripti on" class="control icon delete"></button>

280 </div>	281 </div>

281 </template>	282 </template>

282 </ul>	283 </ul>

283 <div class="side-controls wrap">	284 <div class="side-controls wrap">

284 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="import"></button>	285 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="import"></button>

285 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button>	286 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button>

286 </div>	287 </div>

287 </section>	288 </section>

288	289

289 <section class="cols">	290 <section class="cols">

(...skipping 140 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
430 </div>	431 </div>

431 <!-- Notification -->	432 <!-- Notification -->

432 <div id="notification" aria-hidden="true" aria-live="polite">	433 <div id="notification" aria-hidden="true" aria-live="polite">

433 <strong id="notification-text"></strong>	434 <strong id="notification-text"></strong>

434 <button class="icon close secondary" data-action="hide-notification">	435 <button class="icon close secondary" data-action="hide-notification">

435 <span class="i18n_options_notification_hide sr-only"></span>	436 <span class="i18n_options_notification_hide sr-only"></span>

436 </button>	437 </button>

437 </div>	438 </div>

438 </body>	439 </body>

439 </html>	440 </html>

OLD	NEW

« no previous file with comments | « background.js ('k') | js/desktop-options.js » ('j') | skin/icons/checkbox.svg » ('J')