Skip to content
This repository has been archived by the owner. It is now read-only.

Move top navigation outside the main.js #8149

Closed
wants to merge 1 commit into from

Conversation

@NejcZdovc
Copy link
Member

NejcZdovc commented Apr 9, 2017

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).

Resolves #8189

@luixxiul
Copy link
Contributor

luixxiul commented Apr 9, 2017

Please create an issue for tracking/QA, thanks.

@NejcZdovc
Copy link
Member Author

NejcZdovc commented Apr 9, 2017

Will do, but first we need to define some more things 😄

@NejcZdovc NejcZdovc force-pushed the NejcZdovc:feature/redux-navigator branch 2 times, most recently from 7696c59 to db96ab0 Apr 9, 2017
@NejcZdovc NejcZdovc changed the title Top navigation in redux (refactoring) Move top navigation outside the main.js Apr 10, 2017
@NejcZdovc NejcZdovc force-pushed the NejcZdovc:feature/redux-navigator branch from db96ab0 to 5aea176 Apr 10, 2017
@NejcZdovc
Copy link
Member Author

NejcZdovc commented Apr 10, 2017

Files move was moved into a separate PR #8187, will rebase to the master after that PR is in. This PR will now focus only on moving logic into new component. For redux implementation I will create separate PR.

testId='braveShieldButton'
className={cx({
navbutton: true,
braveShieldsDisabled: shieldDisabled,

This comment has been minimized.

Copy link
@bridiver

bridiver Apr 10, 2017

Collaborator

I think braveShieldsDisabled and braveShieldsDown can be too easily confused and the button doesn't need to know or care why shields are disabled. I would suggest combining into a single setting and method that handles both cases

This comment has been minimized.

Copy link
@NejcZdovc

NejcZdovc Apr 10, 2017

Author Member

we are using different css for this two states. Icon is different color if shield is down or disabled

This comment has been minimized.

Copy link
@bridiver

bridiver Apr 10, 2017

Collaborator

ok, the naming is a little confusing, but I guess it matches what is there now

* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const frameStateUtil = require('../../../js/state/frameStateUtil')

This comment has been minimized.

Copy link
@bridiver

bridiver Apr 10, 2017

Collaborator

I think we would like to avoid adding new *Util classes. Maybe add this to frameState.js and pass in state and frameKey?

This comment has been minimized.

Copy link
@NejcZdovc

NejcZdovc Apr 10, 2017

Author Member

Yeah I wanted to create util for now and then when moving to redux create shield state. What do you think should we move this into frame or shield state? Keep in mind that we have a lot of logic for the panel

This comment has been minimized.

Copy link
@bridiver

bridiver Apr 10, 2017

Collaborator

shieldState is fine, but I'd still like to pass in the frame for now vs activeRequestedLocation. Can we also change the name to braveShieldsEnabled? !braveShieldsDisabled is harder to read

Resovles #8189

Auditor: @bridiver
@NejcZdovc NejcZdovc force-pushed the NejcZdovc:feature/redux-navigator branch from 5aea176 to 633a2aa Apr 10, 2017
@NejcZdovc NejcZdovc changed the base branch from redux-master to master Apr 10, 2017
@NejcZdovc
Copy link
Member Author

NejcZdovc commented Apr 10, 2017

@bridiver will create a new PR, so that branch will have the correct name, also travis is not triggering.

@NejcZdovc NejcZdovc closed this Apr 10, 2017
bridiver added a commit that referenced this pull request Apr 12, 2017
Moves navigation logic from main.js to new component
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.