From d6c925600fa8a36cc0cec45687968bebcbece2fa Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 25 Nov 2015 15:11:57 +1100 Subject: [PATCH] temporarily add back compiler while figuring out a better system --- app/assets/javascripts/ember_include.js.erb | 1 + config/application.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/ember_include.js.erb b/app/assets/javascripts/ember_include.js.erb index 759b468a37..72857343a4 100644 --- a/app/assets/javascripts/ember_include.js.erb +++ b/app/assets/javascripts/ember_include.js.erb @@ -3,6 +3,7 @@ if Rails.env.development? || Rails.env.test? require_asset ("ember-template-compiler.js") require_asset ("ember.debug.js") else + require_asset ("ember-template-compiler.js") require_asset ("ember.prod.js") end %> diff --git a/config/application.rb b/config/application.rb index a806a952cd..e5d678eab2 100644 --- a/config/application.rb +++ b/config/application.rb @@ -69,7 +69,7 @@ module Discourse path =~ /assets\/images/ && !%w(.js .css).include?(File.extname(filename)) end] - config.assets.precompile += ['vendor.js', 'common.css', 'desktop.css', 'mobile.css', 'admin.js', 'admin.css', 'shiny/shiny.css', 'preload_store.js', 'browser-update.js', 'embed.css', 'break_string.js', 'ember_jquery.js'] + config.assets.precompile += ['vendor.js', 'common.css', 'desktop.css', 'mobile.css', 'admin.js', 'admin.css', 'shiny/shiny.css', 'preload_store.js', 'browser-update.js', 'embed.css', 'break_string.js', 'ember_jquery.js', 'ember-template-compiler.js'] # Precompile all defer Dir.glob("#{config.root}/app/assets/javascripts/defer/*.js").each do |file|