Merge remote-tracking branch 'upstream/pull/1926'

[rails.git] / config / initializers / assets.rb

diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 5d908041f2313167ea31e17d72ed03f88c18834d..4193fe482e777cb5ddb5f241cd48c700bf062f5b 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -6,19 +6,21 @@ Rails.application.config.assets.version = "1.0"
 # Location of manifest file.
 Rails.application.config.assets.manifest = Rails.root.join("tmp", "manifest.json")
 
 # Location of manifest file.
 Rails.application.config.assets.manifest = Rails.root.join("tmp", "manifest.json")
 

-# Add additional assets to the asset load path
+# Add additional assets to the asset load path.

 Rails.application.config.assets.paths << Rails.root.join("config")
 
 # Precompile additional assets.
 Rails.application.config.assets.paths << Rails.root.join("config")
 
 # Precompile additional assets.

-# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.

 Rails.application.config.assets.precompile += %w[index.js browse.js welcome.js fixthemap.js]
 Rails.application.config.assets.precompile += %w[index.js browse.js welcome.js fixthemap.js]

-Rails.application.config.assets.precompile += %w[user.js login.js diary_entry.js edit/*.js]
+Rails.application.config.assets.precompile += %w[user.js login.js diary_entry.js messages.js edit/*.js i18n/*.js]

 Rails.application.config.assets.precompile += %w[screen-ltr.css print-ltr.css]
 Rails.application.config.assets.precompile += %w[screen-rtl.css print-rtl.css]
 Rails.application.config.assets.precompile += %w[leaflet-all.css leaflet.ie.css]
 Rails.application.config.assets.precompile += %w[id.js id.css]
 Rails.application.config.assets.precompile += %w[embed.js embed.css]
 Rails.application.config.assets.precompile += %w[screen-ltr.css print-ltr.css]
 Rails.application.config.assets.precompile += %w[screen-rtl.css print-rtl.css]
 Rails.application.config.assets.precompile += %w[leaflet-all.css leaflet.ie.css]
 Rails.application.config.assets.precompile += %w[id.js id.css]
 Rails.application.config.assets.precompile += %w[embed.js embed.css]

-Rails.application.config.assets.precompile += %w[html5shiv.js]
+Rails.application.config.assets.precompile += %w[errors.css]
+Rails.application.config.assets.precompile += %w[html5shiv.js es5.js es6.js]

 Rails.application.config.assets.precompile += %w[images/marker-*.png img/*-handle.png]
 Rails.application.config.assets.precompile += %w[swfobject.js expressInstall.swf]
 Rails.application.config.assets.precompile += %w[potlatch2.swf]
 Rails.application.config.assets.precompile += %w[images/marker-*.png img/*-handle.png]
 Rails.application.config.assets.precompile += %w[swfobject.js expressInstall.swf]
 Rails.application.config.assets.precompile += %w[potlatch2.swf]