Skip to content
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

Calling router.map now appends the routes instead of replacing them #2892

Merged
merged 2 commits into from
Jun 26, 2013

Conversation

igorT
Copy link
Member

@igorT igorT commented Jun 25, 2013

I would have added a test but there did not seem to be any route
generation tests.

I would have added a test but there did not seem to be any route
generation tests.
@machty
Copy link
Contributor

machty commented Jun 25, 2013

Duplicate of #2485 ?

@igorT
Copy link
Member Author

igorT commented Jun 25, 2013

Heh, seems like it, missed it. Though I think this code looks simpler?

@igorT
Copy link
Member Author

igorT commented Jun 25, 2013

Thx, I read through the discussion.

…imes without the map being overwritten. Allows routes to be added at runtime. One test with multiple cases also added.

Conflicts:

	packages/ember-routing/lib/system/router.js
@igorT
Copy link
Member Author

igorT commented Jun 26, 2013

@stefanpenner @machty should be ready now

stefanpenner added a commit that referenced this pull request Jun 26, 2013
Calling router.map now appends the routes instead of replacing them
@stefanpenner stefanpenner merged commit 6cac51f into emberjs:master Jun 26, 2013
@machty
Copy link
Contributor

machty commented Jun 26, 2013

👍

@yosoyju
Copy link

yosoyju commented Apr 28, 2015

This seems to be no longer working in 1.11.1 and 1.12.0-beta 1.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants