Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-10 07:16:03 +01:00
Code Issues Packages Projects Releases Activity

Updgrade to jquery-rails 3.1.4 (#20380).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14654 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-10-09 07:05:09 +00:00
parent 8369b6b133
commit 02e598e232
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@@ -5,7 +5,7 @@ if Gem::Version.new(Bundler::VERSION) < Gem::Version.new('1.5.0')
end end
gem "rails", "4.2.4" gem "rails", "4.2.4"
gem "jquery-rails", "~> 3.1.3" gem "jquery-rails", "~> 3.1.4"
gem "coderay", "~> 1.1.0" gem "coderay", "~> 1.1.0"
gem "builder", ">= 3.0.4" gem "builder", ">= 3.0.4"
gem "request_store", "1.0.5" gem "request_store", "1.0.5"

2
app/helpers/application_helper.rb
View File

@@ -1265,7 +1265,7 @@ module ApplicationHelper
# Returns the javascript tags that are included in the html layout head # Returns the javascript tags that are included in the html layout head
def javascript_heads def javascript_heads
tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.3', 'application') tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.4', 'application')
unless User.current.pref.warn_on_leaving_unsaved == '0' unless User.current.pref.warn_on_leaving_unsaved == '0'
tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });") tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
end end

4
public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-3.1.3.js → public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-3.1.4.js
View File

File diff suppressed because one or more lines are too long