diff options
| author | jpl | 2016-11-02 15:57:33 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2016-11-08 18:15:11 +0100 |
| commit | d512e3784530ae89aeec221fc2ee850cac13f650 (patch) | |
| tree | 3794976e2e66fe4cb3e552ea56099f9c60a55aa9 /config | |
| parent | b6b1cffa4888273ea2e1d7d3e11189385a706af1 (diff) | |
| download | chouette-core-d512e3784530ae89aeec221fc2ee850cac13f650.tar.bz2 | |
adding es6 for itineraries devpt
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 3 | ||||
| -rw-r--r-- | config/initializers/assets.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 52da477a5..b90950607 100644 --- a/config/application.rb +++ b/config/application.rb @@ -26,5 +26,8 @@ module ChouetteIhm # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] config.i18n.default_locale = :fr + + # Configure Browserify to use babelify to compile ES6 + config.browserify_rails.commandline_options = "-t [ babelify --presets [ es2015 ] ]" end end diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index d2f4ec33a..928236c4a 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -5,4 +5,4 @@ Rails.application.config.assets.version = '1.0' # Precompile additional assets. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. -# Rails.application.config.assets.precompile += %w( search.js ) +Rails.application.config.assets.precompile += %w( es6_browserified/*.js ) |