Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAugier <contact@c-henry.fr>2016-08-07 12:30:29 +0300
committerAugier <contact@c-henry.fr>2016-08-07 17:14:52 +0300
commit2e175c4be5cf91b12b454c66530d2860dbe1a9d2 (patch)
tree426d84d80f26123de663bfa611f1bd3659ef6cda /app/helpers
parentd835cc4b1bdfd29994382bfad4f3d1ba07688393 (diff)
Bump to jQuery 2
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/application_helper.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2e55122e4..b488aa4c6 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -52,11 +52,11 @@ module ApplicationHelper
def jquery_include_tag
buf = []
if AppConfig.privacy.jquery_cdn?
- version = Jquery::Rails::JQUERY_VERSION
+ version = Jquery::Rails::JQUERY_2_VERSION
buf << [ javascript_include_tag("//code.jquery.com/jquery-#{version}.min.js") ]
- buf << [ javascript_tag("!window.jQuery && document.write(unescape('#{j javascript_include_tag("jquery")}'));") ]
+ buf << [javascript_tag("!window.jQuery && document.write(unescape('#{j javascript_include_tag('jquery2')}'));")]
else
- buf << [ javascript_include_tag('jquery') ]
+ buf << [javascript_include_tag("jquery2")]
end
buf << [ javascript_include_tag('jquery_ujs') ]
buf << [ javascript_tag("jQuery.ajaxSetup({'cache': false});") ]