Skip to content

/ ghostery-extension

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GH-2216: Disable setup sidebar link on fourth page of setup #631

Merged
merged 8 commits into from Nov 20, 2020
+1 −1
Merged

GH-2216: Disable setup sidebar link on fourth page of setup #631

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
cd7b77d
Disable the Customize Setup link on setup page 4
benstrumeyer Nov 12, 2020
ff67705
Refactor code
benstrumeyer Nov 12, 2020
3094f8c
Add parenthesis
benstrumeyer Nov 12, 2020
29500bf
Revert disabling customize setup link
benstrumeyer Nov 13, 2020
55dd190
Keep sidebar links disabled in entire setup flow
benstrumeyer Nov 13, 2020
3e34fdd
Add comma
benstrumeyer Nov 13, 2020
c8462c5
Merge in latest develop
Nov 18, 2020
4759974
Merge branch 'develop' into GH-2216
christophertino Nov 20, 2020
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next

Revert disabling customize setup link

  • Loading branch information
@benstrumeyer
benstrumeyer committed Nov 13, 2020
commit 29500bf1b4953158e1594797ff66e716569c6834
5 app/hub/Views/SideNavigationView/SideNavigationView.jsx
View file
Open in desktop
@@ -29,11 +29,8 @@ const { GHOSTERY_BASE_URL } = globals;
* @return {JSX} JSX of the Navigation Menu Item
*/
function _renderMenuItem(item, disableNav) {
// Disable the sidebar link that leads to a blank screen on custom setup page 4 (GH-2216)
const shouldDisableSetupLink = (window.location.href.indexOf('setup/4') > -1) && (item.href.substring(1) === 'setup');

const linkClassNames = ClassNames('flex-container align-middle', {
disabled: disableNav || shouldDisableSetupLink
disabled: disableNav
});

return (
ProTip! Use n and p to navigate between commits in a pull request.