diff --git a/Gemfile.lock b/Gemfile.lock index f71dddb6..eaa5a4b3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-api.git - revision: 2705e23bb60c1c1e140912c18f6f20ada8ad0139 + revision: dd2c469443014798a45b9308654e45ae4db7139f specs: travis-api (0.0.1) backports (~> 2.5) diff --git a/assets/scripts/app/controllers/profile.coffee b/assets/scripts/app/controllers/profile.coffee index b6e18569..e9b38454 100644 --- a/assets/scripts/app/controllers/profile.coffee +++ b/assets/scripts/app/controllers/profile.coffee @@ -5,7 +5,9 @@ Travis.ProfileController = Travis.Controller.extend account: (-> login = @get('params.login') || Travis.app.get('currentUser.login') - @get('accounts').filter((account) -> account if account.get('login') == login)[0] + account = @get('accounts').filter((account) -> account if account.get('login') == login)[0] + account.select() if account + account ).property('accounts.length', 'params.login') activate: (action, params) -> diff --git a/assets/scripts/app/models/account.coffee b/assets/scripts/app/models/account.coffee index 85ffc5af..4169903e 100644 --- a/assets/scripts/app/models/account.coffee +++ b/assets/scripts/app/models/account.coffee @@ -10,4 +10,3 @@ require 'travis/model' urlGithub: (-> "http://github.com/#{@get('login')}" ).property() - diff --git a/assets/scripts/app/models/repo.coffee b/assets/scripts/app/models/repo.coffee index 033e3aa6..7b513a59 100644 --- a/assets/scripts/app/models/repo.coffee +++ b/assets/scripts/app/models/repo.coffee @@ -66,9 +66,6 @@ require 'travis/model' ) && {} ).property() - select: -> - Travis.Repo.select(@get('id')) - updateTimes: -> @notifyPropertyChange 'lastBuildDuration' @@ -89,10 +86,6 @@ require 'travis/model' repo = $.select(@find().toArray(), (repo) -> repo.get('slug') == slug) if repo.length > 0 then repo else @find(slug: slug) - select: (id) -> - @find().forEach (repo) -> - repo.set('selected', repo.get('id') == id) - # buildURL: (slug) -> # if slug then slug else 'repos' diff --git a/assets/scripts/app/templates/profile/accounts.hbs b/assets/scripts/app/templates/profile/accounts.hbs index 1cf10746..8bde616f 100644 --- a/assets/scripts/app/templates/profile/accounts.hbs +++ b/assets/scripts/app/templates/profile/accounts.hbs @@ -14,5 +14,6 @@ Repositories: {{view.content.reposCount}}

+
{{/collection}} diff --git a/assets/scripts/lib/travis/model.coffee b/assets/scripts/lib/travis/model.coffee index fba6e01e..81b3474f 100644 --- a/assets/scripts/lib/travis/model.coffee +++ b/assets/scripts/lib/travis/model.coffee @@ -11,6 +11,9 @@ @set(key, value) unless key is 'id' this + select: -> + @constructor.select(@get('id')) + @Travis.Model.reopenClass find: -> if arguments.length == 0 @@ -24,6 +27,10 @@ load: (attrs) -> Travis.app.store.load(this, attrs) + select: (id) -> + @find().forEach (record) -> + record.set('selected', record.get('id') == id) + buildURL: (suffix) -> base = @url || @pluralName() Ember.assert('Base URL (' + base + ') must not start with slash', !base || base.toString().charAt(0) != '/') diff --git a/public/scripts/app.js b/public/scripts/app.js index 5a7e7363..04009534 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 autoSignIn: function() {\n return this.get('auth').autoSignIn();\n },\n signOut: function() {\n this.get('auth').signOut();\n return this.get('router').send('afterSignOut');\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: $('