logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 60a9b938b408b934edbe7315ec85bb9133deefe4
parent: dd517b9a552ff82180901e58e14e2206a7c6f478
Author: Yamagishi Kazutoshi <ykzts@desire.sh>
Date:   Fri, 21 Apr 2017 23:46:32 +0900

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.

Diffstat:

Mapp/assets/javascripts/application.js2+-
Mapp/assets/javascripts/application_public.js2+-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 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 @@ -1,4 +1,4 @@ -//= require jquery +//= require jquery2 //= require jquery_ujs //= require extras //= require best_in_place