From 192c68a71f998554b6b016e67526f4d09cbbe45c Mon Sep 17 00:00:00 2001 From: Tlazypanda <33183263+Tlazypanda@users.noreply.github.com> Date: Sat, 18 Jul 2020 04:14:20 +0530 Subject: [PATCH] externalise jquery using jquery-raisl-cdn and jquery-rails fallback --- Gemfile | 3 ++- app/assets/javascripts/application.js | 2 -- app/views/layouts/application.html.erb | 1 + config/application.rb | 10 ++++++---- config/initializers/jquery_cdn.rb | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 config/initializers/jquery_cdn.rb diff --git a/Gemfile b/Gemfile index 3f1fc374e2..c1a007e96a 100644 --- a/Gemfile +++ b/Gemfile @@ -70,7 +70,8 @@ gem 'lemmatizer', '~> 0.2.2' gem 'mailman', require: false # To implement fontawesome v4.7.0 gem "font-awesome-rails" - gem "lazyload-rails" +gem "lazyload-rails" +gem 'jquery-rails-cdn' # To convert html to markdown gem 'reverse_markdown' diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index b36ea514b1..f1a9dd765c 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -14,8 +14,6 @@ // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD // GO AFTER THE REQUIRES BELOW. // -//= require jquery -//= require jquery_ujs //= require jquery-lazyload/jquery.lazyload.js //= require debounce/index.js //= require bootstrap/dist/js/bootstrap.bundle.min.js diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index bbe2691d47..a9c46a9ea8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -32,6 +32,7 @@ + <%= jquery_include_tag :google, force: true %> <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> diff --git a/config/application.rb b/config/application.rb index 3b1f4aa3f9..8def69ee8b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -54,15 +54,15 @@ class Application < Rails::Application # Enable the asset pipeline config.assets.enabled = true - + I18n.available_locales = [:en, :de, "zh-CN", :ar, :es, "hi-IN", :it, :ko, "pt-BR", :ru] - config.i18n.default_locale = :en - + config.i18n.default_locale = :en + config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')] # rails will fallback to config.i18n.default_locale translation config.i18n.fallbacks = true - + # rails will fallback to en, no matter what is set as config.i18n.default_locale config.i18n.fallbacks = [:en] @@ -74,6 +74,8 @@ class Application < Rails::Application config.paths.add File.join('app/api'), glob: File.join('**', '*.rb') config.autoload_paths += Dir[Rails.root.join('app','api', '**', '*.rb')] + config.assets.precompile += ['jquery3.js'] + # Version of your assets, change this if you want to expire all your assets config.assets.version = '1.0' config.assets.paths << Rails.root.join("public","lib") diff --git a/config/initializers/jquery_cdn.rb b/config/initializers/jquery_cdn.rb new file mode 100644 index 0000000000..02cc569495 --- /dev/null +++ b/config/initializers/jquery_cdn.rb @@ -0,0 +1 @@ +Jquery::Rails::Cdn.major_version = 3