summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-26 11:47:51 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-12-26 11:47:51 +0000
commit7606353ff99134c4f160ce9ed1aaefce50bc437c (patch)
treec19651f4020a212eb96101c89a67eb2d74f84090 /app
parent7b8ebb7e3ffc62e28396fadbd009216eb0e53c5f (diff)
downloadredmine-7606353ff99134c4f160ce9ed1aaefce50bc437c.tar.gz
redmine-7606353ff99134c4f160ce9ed1aaefce50bc437c.zip
Upgraded JQuery to 1.8.3 and JQuery UI to 1.9.2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11081 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/helpers/application_helper.rb2
-rw-r--r--app/views/layouts/base.html.erb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 36072e44d..e2eb9cc8b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1183,7 +1183,7 @@ module ApplicationHelper
# Returns the javascript tags that are included in the html layout head
def javascript_heads
- tags = javascript_include_tag('jquery-1.7.2-ui-1.8.21-ujs-2.0.3', 'application')
+ tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application')
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)}'); });")
end
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index f448479bd..23d5f2b43 100644
--- a/app/views/layouts/base.html.erb
+++ b/app/views/layouts/base.html.erb
@@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.8.21', 'application', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= heads_for_theme %>