From 41ab0c4cb02ee28f43d0f64b931f9e58c6a4ed49 Mon Sep 17 00:00:00 2001 From: Sven Fuchs Date: Mon, 8 Oct 2012 13:38:13 +0200 Subject: [PATCH] set content on user permissions array proxy --- Gemfile.lock | 4 ++-- assets/scripts/app/models/user.coffee | 2 +- lib/travis/web/app.rb | 2 +- public/scripts/app.js | 2 +- public/scripts/min/app.js | 2 +- public/version | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index cc17fc67..3807e8ac 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -43,7 +43,7 @@ GIT GIT remote: git://github.com/travis-ci/travis-api.git - revision: d59b3b1c0048a3939af144fd5907a2ccc36da864 + revision: fa4c5db39b94234e9a3a87da0b4ccca466e034e2 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: 05ea6a6696b3be32839afcaa126afaf3f2522536 + revision: 7c84635b5c180a716150c4300bff3ea8f381248c branch: sf-travis-api specs: travis-core (0.0.1) diff --git a/assets/scripts/app/models/user.coffee b/assets/scripts/app/models/user.coffee index 5e453fd0..a98d8cd4 100644 --- a/assets/scripts/app/models/user.coffee +++ b/assets/scripts/app/models/user.coffee @@ -26,7 +26,7 @@ require 'travis/model' permissions: (-> unless @permissions - @permissions = Ember.ArrayProxy.create() + @permissions = Ember.ArrayProxy.create(content: []) @ajax '/users/permissions', 'get', success: (data) => @permissions.set('content', data.permissions) @permissions ).property() diff --git a/lib/travis/web/app.rb b/lib/travis/web/app.rb index c68d53be..ac867957 100644 --- a/lib/travis/web/app.rb +++ b/lib/travis/web/app.rb @@ -27,9 +27,9 @@ module Travis::Web @app = Rack::Builder.app do use Rack::SSL if config.production? use Rack::Protection::PathTraversal - use Rack::Deflater if config.deflate? use Travis::Web::App::Api, config if config.run_api? + use Rack::Deflater if config.deflate? use Travis::Web::App::Assets, config use Travis::Web::App::Filter, config run Travis::Web::App::Files.new diff --git a/public/scripts/app.js b/public/scripts/app.js index 61751b30..da89d307 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);\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: $('