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.

Sign up for GitHub

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

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

Merged
merged 2 commits into from
Jun 26, 2013
Merged

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

merged 2 commits into from
Jun 26, 2013

Commits on Jun 25, 2013

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

    I would have added a test but there did not seem to be any route
generation tests.
    @igorT
    igorT committed Jun 25, 2013
    Configuration menu
    Copy the full SHA
    957ef28 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2013

  1. Added functionality to Router.map to allow it to be called multiple t… 

    …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
    @wmarbut @igorT
    wmarbut authored and igorT committed Jun 26, 2013
    Configuration menu
    Copy the full SHA
    7f3b972 View commit details
    Browse the repository at this point in the history