Yoji SHIDARA
null+****@clear*****
Tue Oct 2 03:51:10 JST 2012
Yoji SHIDARA 2012-10-02 03:51:10 +0900 (Tue, 02 Oct 2012) New Revision: f3652c6d4161d320a44048816dc8372e56c73548 https://github.com/groonga/gcs/commit/f3652c6d4161d320a44048816dc8372e56c73548 Log: Split router from controllers Added files: public/js/gcs/router.js Modified files: public/js/gcs/controllers.js views/index.jade Modified: public/js/gcs/controllers.js (+0 -67) =================================================================== --- public/js/gcs/controllers.js 2012-10-02 00:25:39 +0900 (f1f6b2a) +++ public/js/gcs/controllers.js 2012-10-02 03:51:10 +0900 (7c59261) @@ -118,70 +118,3 @@ App.DomainController = Ember.ObjectController.extend({ App.DomainShowController = Ember.ObjectController.extend({ }); - -App.Router = Ember.Router.extend({ - root: Ember.Route.extend({ - showIndex: Ember.State.transitionTo('root.index'), - showSearch: Ember.State.transitionTo('domains.search'), - showDomain: Ember.State.transitionTo('domains.show'), - index: Ember.Route.extend({ - route: '/', - connectOutlets: function(router, context) { - router.get('applicationController').connectOutlet('index'); - } - }), - domains: Ember.Route.extend({ - route: 'domains/:domainName', - connectOutlets: function(router, context) { - router.get('applicationController').connectOutlet('domain', context); - }, - serialize: function(router, context) { - return { - domainName: context.get('name') - }; - }, - deserialize: function(router, params) { - // FIXME never called... why? - var domain = App.store.find(App.Domain, params.domainName); - var deferred = Ember.$.Deferred(); - domain.addObserver('isLoaded', function() { - deferred.resolve(domain); - }); - return deferred.promise(domain); - }, - show: Ember.Route.extend({ - route: '/', - connectOutlets: function(router) { - var applicationController = router.get('applicationController'); - var domainController = router.get('domainController'); - var domain = domainController.get('content'); - domainController.set('selectedAction', 'About'); - applicationController.set('selected', domain.get('name')); - domainController.connectOutlet('domainShow', domain); - } - }), - search: Ember.Route.extend({ - route: '/search', - connectOutlets: function(router) { - var applicationController = router.get('applicationController'); - var domainController = router.get('domainController'); - var domain = domainController.get('content'); - var domainSearchController = router.get('domainSearchController'); - domainController.set('selectedAction', 'Search'); - domainSearchController.set('domain', domain); - applicationController.set('selected', domain.get('name')); - domainSearchController.set('query', null); - domainSearchController.reset(); - domainController.connectOutlet('domainSearch'); - }, - nextPage: function(router) { - router.get('domainSearchController').nextPage(); - }, - previousPage: function(router) { - router.get('domainSearchController').previousPage(); - } - }) - }), - loading: Em.State.extend({}) - }) -}); Added: public/js/gcs/router.js (+66 -0) 100644 =================================================================== --- /dev/null +++ public/js/gcs/router.js 2012-10-02 03:51:10 +0900 (c3249e4) @@ -0,0 +1,66 @@ +App.Router = Ember.Router.extend({ + root: Ember.Route.extend({ + showIndex: Ember.State.transitionTo('root.index'), + showSearch: Ember.State.transitionTo('domains.search'), + showDomain: Ember.State.transitionTo('domains.show'), + index: Ember.Route.extend({ + route: '/', + connectOutlets: function(router, context) { + router.get('applicationController').connectOutlet('index'); + } + }), + domains: Ember.Route.extend({ + route: 'domains/:domainName', + connectOutlets: function(router, context) { + router.get('applicationController').connectOutlet('domain', context); + }, + serialize: function(router, context) { + return { + domainName: context.get('name') + }; + }, + deserialize: function(router, params) { + // FIXME never called... why? + var domain = App.store.find(App.Domain, params.domainName); + var deferred = Ember.$.Deferred(); + domain.addObserver('isLoaded', function() { + deferred.resolve(domain); + }); + return deferred.promise(domain); + }, + show: Ember.Route.extend({ + route: '/', + connectOutlets: function(router) { + var applicationController = router.get('applicationController'); + var domainController = router.get('domainController'); + var domain = domainController.get('content'); + domainController.set('selectedAction', 'About'); + applicationController.set('selected', domain.get('name')); + domainController.connectOutlet('domainShow', domain); + } + }), + search: Ember.Route.extend({ + route: '/search', + connectOutlets: function(router) { + var applicationController = router.get('applicationController'); + var domainController = router.get('domainController'); + var domain = domainController.get('content'); + var domainSearchController = router.get('domainSearchController'); + domainController.set('selectedAction', 'Search'); + domainSearchController.set('domain', domain); + applicationController.set('selected', domain.get('name')); + domainSearchController.set('query', null); + domainSearchController.reset(); + domainController.connectOutlet('domainSearch'); + }, + nextPage: function(router) { + router.get('domainSearchController').nextPage(); + }, + previousPage: function(router) { + router.get('domainSearchController').previousPage(); + } + }) + }), + loading: Em.State.extend({}) + }) +}); Modified: views/index.jade (+1 -0) =================================================================== --- views/index.jade 2012-10-02 00:25:39 +0900 (9abf71e) +++ views/index.jade 2012-10-02 03:51:10 +0900 (76abf1c) @@ -10,6 +10,7 @@ html script(src="/js/gcs/base.js", type="text/javascript") script(src="/js/gcs/models.js", type="text/javascript") script(src="/js/gcs/controllers.js", type="text/javascript") + script(src="/js/gcs/router.js", type="text/javascript") script(src="/js/gcs/views.js", type="text/javascript") link(href="/css/bootstrap.min.css", rel="stylesheet") link(href="/css/gcs.css", rel="stylesheet") -------------- next part -------------- HTML����������������������������...下载
