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

Store Router.location in container. #3752

Merged
merged 1 commit into from
Nov 26, 2013

Conversation

rwjblue
Copy link
Member

@rwjblue rwjblue commented Nov 17, 2013

This was suggested in #3702, but since that PR targeted the beta branch we decided not to make significant structural changes.

This enables the location to be looked up from the container (instead of manually created).

Deprecates usage of Ember.Location.registerImplementation.

Resolves #3803.

This was suggested in emberjs#3702, but since that PR targeted the beta branch
we decided not to make significant structural changes.

This enables the location to be looked up from the container (instead of
manually created).

Deprecates usage of `Ember.Location.registerImplementation`.
@stefanpenner
Copy link
Member

cc @tomdale

stefanpenner added a commit that referenced this pull request Nov 26, 2013
@stefanpenner stefanpenner merged commit 3f2ade5 into emberjs:master Nov 26, 2013
rwjblue added a commit to rwjblue/ember.js that referenced this pull request Dec 12, 2013
The refactoring in emberjs#3752 caused the rootURL to not be passed at
initialization time to the location implementation. This change reverses
that by injecting the `router:main` into the newly created location
instance.

The tests were also refactored:

* Split HistoryLocation tests out from the router basic tests.
* Ensure that we are testing the right thing in router tests (ensuring
  that the rootURL is available to the location implementation).
* Fixed issue with existing rootURL check that made the test pass
  due to the fact that the default rootURL (`/`) just happens to be the
  rootURL while running the test via `rackup`.

Resolves: emberjs/ember-dev#115
rwjblue added a commit that referenced this pull request Dec 20, 2013
The refactoring in #3752 caused the rootURL to not be passed at
initialization time to the location implementation. This change reverses
that by injecting the `router:main` into the newly created location
instance.

The tests were also refactored:

* Split HistoryLocation tests out from the router basic tests.
* Ensure that we are testing the right thing in router tests (ensuring
  that the rootURL is available to the location implementation).
* Fixed issue with existing rootURL check that made the test pass
  due to the fact that the default rootURL (`/`) just happens to be the
  rootURL while running the test via `rackup`.

Resolves: emberjs/ember-dev#115
@rwjblue rwjblue deleted the store_location_in_container branch December 27, 2014 04:12
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.

Router location object should be provided by the container.
2 participants