From b9cf05157575c1eb32eaa316551185666e2b5ad6 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Tue, 12 May 2015 15:18:30 +0200 Subject: [PATCH] Show proper layout for owner's loading page --- app/controllers/loading.coffee | 5 +++++ app/routes/owner.coffee | 8 ++++++++ app/views/loading.coffee | 9 +++++++++ 3 files changed, 22 insertions(+) create mode 100644 app/controllers/loading.coffee create mode 100644 app/views/loading.coffee diff --git a/app/controllers/loading.coffee b/app/controllers/loading.coffee new file mode 100644 index 00000000..90babea0 --- /dev/null +++ b/app/controllers/loading.coffee @@ -0,0 +1,5 @@ +`import Ember from 'ember'` + +Controller = Ember.Controller.extend() + +`export default Controller` diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee index 6ad01e2a..dc247146 100644 --- a/app/routes/owner.coffee +++ b/app/routes/owner.coffee @@ -6,10 +6,18 @@ Route = TravisRoute.extend needsAuth: false + deactivate: -> + @controllerFor('loading').set('layoutName', null) + titleToken: (model) -> "#{model.name}" model: (params) -> $.get(config.apiEndpoint + "/v3/owner/#{params.owner}") + beforeModel: -> + @controllerFor('loading').set('layoutName', 'simple') + + @_super.apply(this, arguments) + `export default Route` diff --git a/app/views/loading.coffee b/app/views/loading.coffee new file mode 100644 index 00000000..fd4d7995 --- /dev/null +++ b/app/views/loading.coffee @@ -0,0 +1,9 @@ +`import Ember from 'ember'` + +View = Ember.View.extend + layoutName: (-> + if name = @get('controller.layoutName') + 'layouts/' + name + ).property('controller.layoutName') + +`export default View`