trying to figure out why it changes the url to /#/undefined/undefined after loading /
This commit is contained in:
parent
ae4db19932
commit
2ff639e38e
|
@ -51,6 +51,108 @@ App.Router = Em.Router.extend({
|
||||||
enableLogging: true,
|
enableLogging: true,
|
||||||
location: 'hash',
|
location: 'hash',
|
||||||
|
|
||||||
|
root: Em.Route.extend({
|
||||||
|
viewRepository: Ember.Route.transitionTo('repository.current'),
|
||||||
|
|
||||||
|
// why is applicationController undefined here? would like to share connecting the left outlet to repositories
|
||||||
|
// connectOutlets: function(router) {
|
||||||
|
// router.connectLeft();
|
||||||
|
// },
|
||||||
|
|
||||||
|
serialize: function(router, context) {
|
||||||
|
return router.serialize();
|
||||||
|
},
|
||||||
|
|
||||||
|
index: Em.Route.extend({
|
||||||
|
route: '/',
|
||||||
|
|
||||||
|
serialize: function(router, context) {
|
||||||
|
return router.serialize();
|
||||||
|
},
|
||||||
|
|
||||||
|
connectOutlets: function(router) {
|
||||||
|
router.connectLeft();
|
||||||
|
router.connectLoading();
|
||||||
|
|
||||||
|
var repositories = router.getPath('repositoriesController.content');
|
||||||
|
var build = App.Build.find(1);
|
||||||
|
|
||||||
|
// should observe RecordArray.isLoaded instead, but that doesn't seem to exist?
|
||||||
|
console.log('find repos')
|
||||||
|
onReady(repositories, 'firstObject.isLoaded', function() {
|
||||||
|
console.log('repo loaded')
|
||||||
|
router.connectMain(repositories.get('firstObject'), build)
|
||||||
|
router.connectCurrent(build)
|
||||||
|
});
|
||||||
|
},
|
||||||
|
|
||||||
|
viewCurrent: Ember.Route.transitionTo('repository.current'),
|
||||||
|
viewHistory: Ember.Route.transitionTo('repository.history'),
|
||||||
|
viewBuild: Ember.Route.transitionTo('repository.build'),
|
||||||
|
}),
|
||||||
|
|
||||||
|
repository: Em.Route.extend({
|
||||||
|
route: '/:ownerName/:name',
|
||||||
|
|
||||||
|
serialize: function(router, context) {
|
||||||
|
return router.serialize();
|
||||||
|
},
|
||||||
|
|
||||||
|
connectOutlets: function(router) {
|
||||||
|
router.connectLeft();
|
||||||
|
router.connectLoading();
|
||||||
|
|
||||||
|
// this would be a query for the repo based on path (how to retrieve the path here?)
|
||||||
|
var repository = App.Repository.find(1);
|
||||||
|
console.log('find repo')
|
||||||
|
onReady(repository, 'isLoaded', function() {
|
||||||
|
console.log('repo loaded')
|
||||||
|
router.connectMain(repository, App.Build.find(1))
|
||||||
|
})
|
||||||
|
},
|
||||||
|
|
||||||
|
current: Em.Route.extend({
|
||||||
|
route: '/',
|
||||||
|
|
||||||
|
serialize: function(router, context) {
|
||||||
|
return router.serialize();
|
||||||
|
},
|
||||||
|
|
||||||
|
connectOutlets: function(router, context) {
|
||||||
|
router.connectCurrent(App.Build.find(1))
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
viewCurrent: Ember.Route.transitionTo('current'),
|
||||||
|
|
||||||
|
history: Em.Route.extend({
|
||||||
|
route: '/builds',
|
||||||
|
|
||||||
|
serialize: function(router, context) {
|
||||||
|
return router.serialize();
|
||||||
|
},
|
||||||
|
|
||||||
|
connectOutlets: function(router, context) {
|
||||||
|
router.connectHistory(App.Build.find())
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
viewHistory: Ember.Route.transitionTo('history'),
|
||||||
|
|
||||||
|
build: Em.Route.extend({
|
||||||
|
route: '/builds/:build_id',
|
||||||
|
|
||||||
|
serialize: function(router, context) {
|
||||||
|
return $.extend(router.serialize(), this._super(router, context));
|
||||||
|
},
|
||||||
|
|
||||||
|
connectOutlets: function(router, context) {
|
||||||
|
params = { id: 1 }
|
||||||
|
router.connectBuild(App.Build.find(params.id))
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
viewBuild: Ember.Route.transitionTo('build')
|
||||||
|
})
|
||||||
|
}),
|
||||||
|
|
||||||
serialize: function() {
|
serialize: function() {
|
||||||
var ownerName = this.getPath('repositoryController.content.ownerName');
|
var ownerName = this.getPath('repositoryController.content.ownerName');
|
||||||
var name = this.getPath('repositoryController.content.name');
|
var name = this.getPath('repositoryController.content.name');
|
||||||
|
@ -73,89 +175,17 @@ App.Router = Em.Router.extend({
|
||||||
this.get('repositoryController').connectOutlet({ outletName: 'tabs', name: 'tabs' });
|
this.get('repositoryController').connectOutlet({ outletName: 'tabs', name: 'tabs' });
|
||||||
},
|
},
|
||||||
|
|
||||||
root: Em.Route.extend({
|
connectCurrent: function(build) {
|
||||||
viewRepository: Ember.Route.transitionTo('repository.current'),
|
this.get('repositoryController').connectOutlet({ outletName: 'tab', name: 'current', context: build});
|
||||||
|
},
|
||||||
|
|
||||||
// why is applicationController undefined here? would like to share connecting the left outlet to repositories
|
connectHistory: function(builds) {
|
||||||
// connectOutlets: function(router) {
|
this.get('repositoryController').connectOutlet({ outletName: 'tab', name: 'history', context: builds});
|
||||||
// router.connectLeft();
|
},
|
||||||
// },
|
|
||||||
|
|
||||||
index: Em.Route.extend({
|
connectBuild: function(build) {
|
||||||
route: '/',
|
this.get('repositoryController').connectOutlet({ outletName: 'tab', name: 'build', context: build});
|
||||||
|
}
|
||||||
connectOutlets: function(router) {
|
|
||||||
router.connectLeft();
|
|
||||||
router.connectLoading();
|
|
||||||
|
|
||||||
var repositories = router.getPath('repositoriesController.content');
|
|
||||||
// should observe RecordArray.isLoaded instead, but that doesn't seem to exist?
|
|
||||||
onReady(repositories, 'firstObject.isLoaded', function() {
|
|
||||||
router.connectMain(repositories.get('firstObject'), App.Build.find(1))
|
|
||||||
});
|
|
||||||
},
|
|
||||||
|
|
||||||
viewCurrent: Ember.Route.transitionTo('repository.current'),
|
|
||||||
viewHistory: Ember.Route.transitionTo('repository.history'),
|
|
||||||
viewBuild: Ember.Route.transitionTo('repository.build'),
|
|
||||||
}),
|
|
||||||
|
|
||||||
repository: Em.Route.extend({
|
|
||||||
route: '/:ownerName/:name',
|
|
||||||
|
|
||||||
connectOutlets: function(router) {
|
|
||||||
router.connectLeft();
|
|
||||||
router.connectLoading();
|
|
||||||
|
|
||||||
// this would be a query for the repo based on path (how to retrieve the path here?)
|
|
||||||
var repository = App.Repository.find(1);
|
|
||||||
onReady(repository, 'isLoaded', function() {
|
|
||||||
router.connectMain(repository, App.Build.find(1))
|
|
||||||
})
|
|
||||||
},
|
|
||||||
|
|
||||||
viewCurrent: Ember.Route.transitionTo('current'),
|
|
||||||
viewHistory: Ember.Route.transitionTo('history'),
|
|
||||||
viewBuild: Ember.Route.transitionTo('build'),
|
|
||||||
|
|
||||||
current: Em.Route.extend({
|
|
||||||
route: '/',
|
|
||||||
|
|
||||||
serialize: function(router, context) {
|
|
||||||
return router.serialize();
|
|
||||||
},
|
|
||||||
|
|
||||||
connectOutlets: function(router, context) {
|
|
||||||
router.get('repositoryController').connectOutlet({ outletName: 'tab', name: 'current', context: App.Build.find(1)});
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
|
|
||||||
history: Em.Route.extend({
|
|
||||||
route: '/builds',
|
|
||||||
|
|
||||||
serialize: function(router, context) {
|
|
||||||
return router.serialize();
|
|
||||||
},
|
|
||||||
|
|
||||||
connectOutlets: function(router, context) {
|
|
||||||
router.get('repositoryController').connectOutlet({ outletName: 'tab', name: 'history', context: App.Build.find()});
|
|
||||||
}
|
|
||||||
}),
|
|
||||||
|
|
||||||
build: Em.Route.extend({
|
|
||||||
route: '/builds/:build_id',
|
|
||||||
|
|
||||||
serialize: function(router, context) {
|
|
||||||
return $.extend(router.serialize(), this._super(router, context));
|
|
||||||
},
|
|
||||||
|
|
||||||
connectOutlets: function(router, context) {
|
|
||||||
params = { id: 1 }
|
|
||||||
router.get('repositoryController').connectOutlet({ outletName: 'tab', name: 'build', context: App.Build.find(params.id)});
|
|
||||||
}
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
|
||||||
});
|
});
|
||||||
|
|
||||||
App.initialize();
|
App.initialize();
|
||||||
|
|
3
app/assets/javascripts/vendor/ember.js
vendored
3
app/assets/javascripts/vendor/ember.js
vendored
|
@ -15455,7 +15455,7 @@ Ember.Routable = Ember.Mixin.create({
|
||||||
*/
|
*/
|
||||||
stashContext: function(manager, context) {
|
stashContext: function(manager, context) {
|
||||||
var serialized = this.serialize(manager, context);
|
var serialized = this.serialize(manager, context);
|
||||||
|
console.log(['stashContext', this.name, serialized && serialized.ownerName])
|
||||||
manager.setStateMeta(this, 'serialized', serialized);
|
manager.setStateMeta(this, 'serialized', serialized);
|
||||||
|
|
||||||
if (get(this, 'isRoutable') && !get(manager, 'isRouting')) {
|
if (get(this, 'isRoutable') && !get(manager, 'isRouting')) {
|
||||||
|
@ -15499,6 +15499,7 @@ Ember.Routable = Ember.Mixin.create({
|
||||||
|
|
||||||
var matcher = get(this, 'routeMatcher'),
|
var matcher = get(this, 'routeMatcher'),
|
||||||
serialized = manager.getStateMeta(this, 'serialized');
|
serialized = manager.getStateMeta(this, 'serialized');
|
||||||
|
console.log(['stateMeta', this.name, serialized && serialized.ownerName])
|
||||||
|
|
||||||
// merge the existing serialized object in with the passed
|
// merge the existing serialized object in with the passed
|
||||||
// in hash.
|
// in hash.
|
||||||
|
|
Loading…
Reference in New Issue
Block a user