This repository was archived by the owner on Nov 6, 2023. It is now read-only.
Repository navigation
Update channels ux #16306
Merged
Merged
Update channels ux #16306
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
0229aec
Updating options UX to add tabs and enumerate pinned update channels
Hainish 9e8a328
Ability to update, delete, and create update channels. Re-render the…
Hainish d72809b
Tieing the add/remove update channel UX to update channel functionality
Hainish 13f200a
Fix tests
Hainish File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,24 +6,45 @@ | |
| <link href="style.css" rel="stylesheet"> | ||
| </head> | ||
| <body> | ||
| <div class="section-header"><span class="section-header-span" data-i18n="options_generalSettings"></span></div> | ||
| <div id="counter-wrapper" class="general-settings-wrapper"> | ||
| <input type="checkbox" id="showCounter"> | ||
| <label for="showCounter" data-i18n="menu_showCounter"></label> | ||
| </div> | ||
| <div id="update-wrapper" class="general-settings-wrapper"> | ||
| <input type="checkbox" id="autoUpdateRulesets"> | ||
| <label for="autoUpdateRulesets" data-i18n="options_autoUpdateRulesets"></label> | ||
| <span class="section-header-span active" data-show="general-settings-wrapper" data-i18n="options_generalSettings"></span> | ||
| <span class="section-header-span inactive" data-show="advanced-settings-wrapper" data-i18n="options_advancedSettings"></span> | ||
| <span class="section-header-span inactive" data-show="update-channels-wrapper" data-i18n="options_updateChannels"></span> | ||
|
|
||
| <div class="section-wrapper" id="general-settings-wrapper"> | ||
| <div id="counter-wrapper" class="settings-wrapper"> | ||
| <input type="checkbox" id="showCounter"> | ||
| <label for="showCounter" data-i18n="menu_showCounter"></label> | ||
| </div> | ||
| <div id="update-wrapper" class="settings-wrapper"> | ||
| <input type="checkbox" id="autoUpdateRulesets"> | ||
| <label for="autoUpdateRulesets" data-i18n="options_autoUpdateRulesets"></label> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="section-header"><span class="section-header-span" data-i18n="options_advancedSettings"></span></div> | ||
| <div id="mixed-rulesets-wrapper" class="general-settings-wrapper"> | ||
| <input type="checkbox" id="enableMixedRulesets"> | ||
| <label for="enableMixedRulesets" data-i18n="options_enableMixedRulesets"></label> | ||
| <div class="section-wrapper" id="advanced-settings-wrapper"> | ||
| <div id="mixed-rulesets-wrapper" class="settings-wrapper"> | ||
| <input type="checkbox" id="enableMixedRulesets"> | ||
| <label for="enableMixedRulesets" data-i18n="options_enableMixedRulesets"></label> | ||
| </div> | ||
| <div id="show-devtools-tab-wrapper" class="settings-wrapper"> | ||
| <input type="checkbox" id="showDevtoolsTab"> | ||
| <label for="showDevtoolsTab" data-i18n="options_showDevtoolsTab"></label> | ||
| </div> | ||
| </div> | ||
| <div id="show-devtools-tab-wrapper" class="general-settings-wrapper"> | ||
| <input type="checkbox" id="showDevtoolsTab"> | ||
| <label for="showDevtoolsTab" data-i18n="options_showDevtoolsTab"></label> | ||
|
|
||
| <div class="section-wrapper" id="update-channels-wrapper"> | ||
| <div id="update-channels-error"> | ||
| <span id="update-channels-error-text"></span> | ||
| <img id="update-channels-error-hide" src="/images/remove.png"> | ||
| </div> | ||
| <div id="update-channels-warning" data-i18n="options_updateChannelsWarning"></div> | ||
| <div id="update-channels-last-checked"></div> | ||
| <div class="clearer"></div> | ||
| <div id="update-channels-list"></div> | ||
| <div id="add-update-channel-wrapper"> | ||
| <button id="add-update-channel" data-i18n="options_addUpdateChannel"></button> | ||
| <input type="text" id="update-channel-name" /> | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Currently, an empty channel name works, but it will cause the form rendered oddly. I guess this should be a required field, since it is showed on the popup and used to help the user identify an update channel
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good point. This is fixed in a0bec3d |
||
| </div> | ||
| </div> | ||
|
|
||
| <script src="ux.js"></script> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems to me that EFF's update channels will always have the top priority in rewriting URLs, while other channels are prioritize by insertion order. If the coverage of different channels overlaps, it might not works as the users expected, e.g. some channels might never apply. If this is the case, it might be good to have a way to prioritize the channels (possibly in later PR/ release). Please correct me if I am wrong.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes I think prioritization of update channels makes sense, but this will require some re-engineering. This would be a good task for a future PR.