From 755ff52452e59d5e015532ec84ba9378e32521fb Mon Sep 17 00:00:00 2001 From: Dennis Collinson Date: Wed, 28 Mar 2012 19:01:31 -0700 Subject: [PATCH] turn asset pipeline debugging off there was a collision with the aspects-dropdown view in the new publisher, also it takes too much time with it on --- app/assets/javascripts/app/views.js | 1 + config/environments/development.rb | 6 +++++- config/environments/test.rb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/views.js b/app/assets/javascripts/app/views.js index faadd32ce..366a1cc41 100644 --- a/app/assets/javascripts/app/views.js +++ b/app/assets/javascripts/app/views.js @@ -40,6 +40,7 @@ app.views.Base = Backbone.View.extend({ renderTemplate : function(){ var presenter = _.isFunction(this.presenter) ? this.presenter() : this.presenter this.template = JST[this.templateName] + if(!this.template) {console.log("no template for " + this.templateName) } $(this.el) .html(this.template(presenter)) .attr("data-template", _.last(this.templateName.split("/"))); diff --git a/config/environments/development.rb b/config/environments/development.rb index 19e7118d2..8a3809250 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -20,7 +20,11 @@ Diaspora::Application.configure do config.assets.compress = false # Expands the lines which load the assets - config.assets.debug = true + config.assets.debug = false + + # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets + config.assets.allow_debugging = true + # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false diff --git a/config/environments/test.rb b/config/environments/test.rb index a1958bfeb..0a01b0369 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -35,7 +35,7 @@ Diaspora::Application.configure do config.static_cache_control = "public, max-age=3600" config.assets.enabled = true - config.assets.debug = true + config.assets.debug = false # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets config.assets.allow_debugging = true