diff --git a/Gemfile.lock b/Gemfile.lock index ef9d8e70..4f3ccd70 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-api.git - revision: 02f5eea4fcbea7be5331b86bb60ed84ce2872ceb + revision: 272c1275f49cd33668dd5c4a324d49491dd29496 specs: travis-api (0.0.1) backports (~> 2.5) @@ -61,7 +61,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-core.git - revision: 1448d4b1505b38014d3083f45500d371c8ec999f + revision: 3154d3fbfa6fe4202ade27f5712927b72dc1673b branch: sf-travis-api specs: travis-core (0.0.1) diff --git a/assets/scripts/app/controllers/home.coffee b/assets/scripts/app/controllers/home.coffee index c900505b..068e6edd 100644 --- a/assets/scripts/app/controllers/home.coffee +++ b/assets/scripts/app/controllers/home.coffee @@ -1 +1 @@ -Travis.HomeController = Travis.Controller.extend() +Travis.HomeLayoutController = Travis.Controller.extend() diff --git a/assets/scripts/app/routes.coffee b/assets/scripts/app/routes.coffee index 44c2518f..a626abd9 100644 --- a/assets/scripts/app/routes.coffee +++ b/assets/scripts/app/routes.coffee @@ -254,13 +254,13 @@ Travis.Router = Ember.Router.extend home: Ember.Route.extend route: '/' connectOutlets: (router) -> - router.get('applicationController').connectOutlet 'home' + router.get('applicationController').connectOutlet 'homeLayout' $('body').attr('id', 'home') - router.get('homeController').connectOutlet 'left', 'repos' - router.get('homeController').connectOutlet 'right', 'sidebar' - router.get('homeController').connectOutlet 'top', 'top' - router.get('homeController').connectOutlet 'main', 'repo' - router.get('homeController').connectOutlet 'flash', 'flash' + router.get('homeLayoutController').connectOutlet 'left', 'repos' + router.get('homeLayoutController').connectOutlet 'right', 'sidebar' + router.get('homeLayoutController').connectOutlet 'top', 'top' + router.get('homeLayoutController').connectOutlet 'main', 'repo' + router.get('homeLayoutController').connectOutlet 'flash', 'flash' show: Ember.Route.extend route: '/' diff --git a/assets/scripts/app/views.coffee b/assets/scripts/app/views.coffee index 6627c557..e0b1cad7 100644 --- a/assets/scripts/app/views.coffee +++ b/assets/scripts/app/views.coffee @@ -12,27 +12,13 @@ require 'ext/ember/namespace' @Travis.reopen - HomeView: Travis.View.extend(templateName: 'layouts/home') + HomeLayoutView: Travis.View.extend(templateName: 'layouts/home') AuthLayoutView: Travis.View.extend(templateName: 'layouts/simple') ProfileLayoutView: Travis.View.extend(templateName: 'layouts/profile') StatsLayoutView: Travis.View.extend(templateName: 'layouts/simple') - ApplicationView: Travis.View.extend - templateName: 'application' - localeDidChange: (-> - if locale = Travis.app.get('auth.user.locale') - Travis.setLocale(locale) - Travis.app.get('router').reload() - ).observes('Travis.app.auth.user.locale') - click: (event) -> - # TODO: this solves the case of closing menus and popups, - # but I would like to rewrite it later, not sure how - # yet, but this does not seem optimal - if ! $(event.target).parents().andSelf().hasClass('popup') - @popupCloseAll() - if ! $(event.target).parents().andSelf().hasClass('menu') - $('.menu').removeClass('display') require 'views/accounts' +require 'views/application' require 'views/build' require 'views/flash' require 'views/job' diff --git a/assets/scripts/app/views/application.coffee b/assets/scripts/app/views/application.coffee new file mode 100644 index 00000000..05e0d5ab --- /dev/null +++ b/assets/scripts/app/views/application.coffee @@ -0,0 +1,19 @@ +@Travis.reopen + ApplicationView: Travis.View.extend + templateName: 'application' + + localeDidChange: (-> + if locale = Travis.app.get('auth.user.locale') + Travis.setLocale(locale) + Travis.app.get('router').reload() + ).observes('Travis.app.auth.user.locale') + + click: (event) -> + # TODO: this solves the case of closing menus and popups, + # but I would like to rewrite it later, not sure how + # yet, but this does not seem optimal + if ! $(event.target).parents().andSelf().hasClass('popup') + @popupCloseAll() + if ! $(event.target).parents().andSelf().hasClass('menu') + $('.menu').removeClass('display') + diff --git a/public/scripts/app.js b/public/scripts/app.js index f48cabd8..82bc139a 100644 --- a/public/scripts/app.js +++ b/public/scripts/app.js @@ -29619,4 +29619,4 @@ var _require=function(){function c(a,c){document.addEventListener?a.addEventList ++g&&setTimeout(c,0)})}}(); (function(){!window.WebSocket&&window.MozWebSocket&&(window.WebSocket=window.MozWebSocket);if(window.WebSocket)Pusher.Transport=window.WebSocket,Pusher.TransportType="native";var c=(document.location.protocol=="http:"?Pusher.cdn_http:Pusher.cdn_https)+Pusher.VERSION,a=[];window.JSON||a.push(c+"/json2"+Pusher.dependency_suffix+".js");if(!window.WebSocket)window.WEB_SOCKET_DISABLE_AUTO_INITIALIZATION=!0,a.push(c+"/flashfallback"+Pusher.dependency_suffix+".js");var b=function(){return window.WebSocket?function(){Pusher.ready()}: function(){window.WebSocket?(Pusher.Transport=window.WebSocket,Pusher.TransportType="flash",window.WEB_SOCKET_SWF_LOCATION=c+"/WebSocketMain.swf",WebSocket.__addTask(function(){Pusher.ready()}),WebSocket.__initialize()):(Pusher.Transport=null,Pusher.TransportType="none",Pusher.ready())}}(),e=function(a){var b=function(){document.body?a():setTimeout(b,0)};b()},g=function(){e(b)};a.length>0?_require(a,g):g()})(); -;minispade.register('app', "(function() {(function() {\nminispade.require('auth');\nminispade.require('controllers');\nminispade.require('helpers');\nminispade.require('models');\nminispade.require('pusher');\nminispade.require('routes');\nminispade.require('slider');\nminispade.require('store');\nminispade.require('tailing');\nminispade.require('templates');\nminispade.require('views');\nminispade.require('config/locales');\nminispade.require('data/sponsors');\n\n Travis.reopen({\n App: Em.Application.extend({\n autoinit: false,\n currentUserBinding: 'auth.user',\n authStateBinding: 'auth.state',\n init: function() {\n this._super.apply(this, arguments);\n this.store = Travis.Store.create();\n this.store.loadMany(Travis.Sponsor, Travis.SPONSORS);\n this.set('auth', Travis.Auth.create({\n app: this,\n endpoint: Travis.config.api_endpoint\n }));\n this.slider = new Travis.Slider();\n this.pusher = new Travis.Pusher(Travis.config.pusher_key);\n return this.tailing = new Travis.Tailing();\n },\n signIn: function() {\n return this.get('auth').signIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('showRoot');\n },\n receive: function() {\n return this.store.receive.apply(this.store, arguments);\n },\n toggleSidebar: function() {\n var element;\n $('body').toggleClass('maximized');\n element = $('');\n $('#top .profile').append(element);\n Em.run.later((function() {\n return element.remove();\n }), 10);\n element = $('');\n $('#repo').append(element);\n return Em.run.later((function() {\n return element.remove();\n }), 10);\n }\n })\n });\n\n}).call(this);\n\n})();\n//@ sourceURL=app");minispade.register('auth', "(function() {(function() {\n\n this.Travis.Auth = Ember.Object.extend({\n iframe: $('