feat(app-routing): improve app routing#451
Closed
kingcody wants to merge 1 commit intoangular-fullstack:canaryfrom
Closed
feat(app-routing): improve app routing#451kingcody wants to merge 1 commit intoangular-fullstack:canaryfrom
kingcody wants to merge 1 commit intoangular-fullstack:canaryfrom
Conversation
This was referenced Aug 15, 2014
kingcody
force-pushed
the
feature/improved-routing
branch
from
cb48382 to
8d94140
Compare
kingcody
changed the title
kingcody
force-pushed
the
feature/improved-routing
branch
2 times, most recently
from
e3e2ffb to
0f85153
Compare
Member
Author
|
@DaftMonk, just wondering if this PR needs anything added/removed/changed? |
Member
|
@kingcody Just haven't had the chance to review it yet. I'll take a look tomorrow. |
Member
Author
|
No rush, just wanted to see if there was anything i could do to make your job easier. |
Changes:
- Use `ui-sref` instead of `href` or `ng-href` when ui-router is chosen
- Use `ui-sref-active` instead of `ng-class='{active: isActive()}'` when ui-router is chosen
- Use `$state.go()` where applicable, when ui-router is chosen
- Use `$scope.menu[n].state` instead of `$scope.menu[n].link` when ui-router is chosen (attempt to remove possible confusion)
- Omit `$scope.isActive` when ui-router is chosen
- Simplify `navbar(jade).jade` templating (remove extra `<% if (filters.auth) %>` tag)
- Add `/logout` route for both ng-route and ui-router
- Use `$routeChangeStart` or `$stateChangeStart` to pass refering route or state to `/logout`
- Add `stateMock` for testing `$state` transitions
- Use `stateMock` in main.controller for expecting template requests from state transistions
Closes angular-fullstack#331
kingcody
force-pushed
the
feature/improved-routing
branch
from
0f85153 to
135c5a9
Compare
Member
Author
|
rebased onto |
Member
|
Merged into canary. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Changes:
ui-srefinstead ofhreforng-hrefwhen ui-router is chosenui-sref-activeinstead ofng-class='{active: isActive()}'when ui-router is chosen$state.go()where applicable, when ui-router is chosen$scope.menu[n].stateinstead of$scope.menu[n].linkwhen ui-router is chosen (attempt to remove possible confusion)$scope.isActivewhen ui-router is chosennavbar(jade).jadetemplating (remove extra<% if (filters.auth) %>tag)/logoutroute for both ng-route and ui-router$routeChangeStartor$stateChangeStartto pass refering route or state to/logoutstateMockfor testing$statetransitionsstateMockin main.controller for expecting template requests from state transistionsCloses #331