From b921bdc3cf8b15a08423bae77d74d0c36052d62e Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Fri, 21 Apr 2017 23:46:32 +0900 Subject: [PATCH] Upgrade jQuery to v2.x (#2246) Fix #2199 and minifying assets file. jQuery v1.x is supports legacy browsers. But, Mastodon does not support legacy browsers. I think jQuery v1.x is unnecessary. --- app/assets/javascripts/application.js | 2 +- app/assets/javascripts/application_public.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index e2fffd9320..4412828259 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -10,6 +10,6 @@ // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details // about supported directives. // -//= require jquery +//= require jquery2 //= require jquery_ujs //= require components diff --git a/app/assets/javascripts/application_public.js b/app/assets/javascripts/application_public.js index 9626c5dae1..ae151a301d 100644 --- a/app/assets/javascripts/application_public.js +++ b/app/assets/javascripts/application_public.js @@ -1,4 +1,4 @@ -//= require jquery +//= require jquery2 //= require jquery_ujs //= require extras //= require best_in_place