Backport r13313 from rails-4.1 to trunk.

Upgrade to JQuery 1.11.1

git-svn-id: http://svn.redmine.org/redmine/trunk@13408 e93f8b46-1217-0410-a6f0-8f06a7374b81

9 files changed, 11 insertions, 11 deletions

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f344f169b..96f4e67bb 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1295,7 +1295,7 @@ module ApplicationHelper
 
   # Returns the javascript tags that are included in the html layout head
   def javascript_heads
-    tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application')
+    tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.1', '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/issues/bulk_edit.html.erb b/app/views/issues/bulk_edit.html.erb
index 2b063f957..b1786dde3 100644
--- a/app/views/issues/bulk_edit.html.erb
+++ b/app/views/issues/bulk_edit.html.erb
@@ -185,7 +185,7 @@
 <%= javascript_tag do %>
 $(window).load(function(){
   $(document).on('change', 'input[data-disables]', function(){
-    if ($(this).attr('checked')){
+    if ($(this).prop('checked')){
       $($(this).data('disables')).attr('disabled', true).val('');
     } else {
       $($(this).data('disables')).attr('disabled', false);
diff --git a/app/views/journals/new.js.erb b/app/views/journals/new.js.erb
index 78ec5f360..cd6ab0d35 100644
--- a/app/views/journals/new.js.erb
+++ b/app/views/journals/new.js.erb
@@ -3,7 +3,7 @@ $('#issue_notes').val("<%= raw escape_javascript(@content) %>");
   # when quoting a private journal, check the private checkbox
   if @journal && @journal.private_notes? 
 %>
-$('#issue_private_notes').attr('checked', true);
+$('#issue_private_notes').prop('checked', true);
 <% end %>
 
 showAndScrollTo("update", "notes");
diff --git a/app/views/layouts/base.html.erb b/app/views/layouts/base.html.erb
index 99ad13ff1..0524b22a7 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.9.2', 'application', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.11.0', 'application', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= heads_for_theme %>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index 03202833e..7828bc1b4 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -92,7 +92,7 @@
 <%= javascript_tag do %>
 $(document).ready(function() {
   $('#project_enabled_module_names_issue_tracking').on('change', function(){
-    if ($(this).attr('checked')){
+    if ($(this).prop('checked')){
       $('#project_trackers, #project_issue_custom_fields').show();
     } else {
       $('#project_trackers, #project_issue_custom_fields').hide();
diff --git a/app/views/repositories/_revisions.html.erb b/app/views/repositories/_revisions.html.erb
index 6ef7d21c5..be8641388 100644
--- a/app/views/repositories/_revisions.html.erb
+++ b/app/views/repositories/_revisions.html.erb
@@ -37,8 +37,8 @@ end %>
 <%= content_tag(:td, :class => 'id', :style => id_style) do %>
   <%= link_to_revision(changeset, @repository) %>
 <% end %>
-<td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').attr('checked',true);") if show_diff && (line_num < revisions.size) %></td>
-<td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('#cb-#{line_num}').attr('checked')) {$('#cb-#{line_num-1}').attr('checked',true);}") if show_diff && (line_num > 1) %></td>
+<td class="checkbox"><%= radio_button_tag('rev', changeset.identifier, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').prop('checked',true);") if show_diff && (line_num < revisions.size) %></td>
+<td class="checkbox"><%= radio_button_tag('rev_to', changeset.identifier, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('#cb-#{line_num}').prop('checked')) {$('#cb-#{line_num-1}').prop('checked',true);}") if show_diff && (line_num > 1) %></td>
 <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
 <td class="author"><%= changeset.author.to_s.truncate(30) %></td>
 <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
diff --git a/app/views/search/index.html.erb b/app/views/search/index.html.erb
index 9ea481619..9c884811a 100644
--- a/app/views/search/index.html.erb
+++ b/app/views/search/index.html.erb
@@ -56,8 +56,8 @@
 <%= javascript_tag do %>
 $("#search-types a").click(function(e){
   e.preventDefault();
-  $("#search-types input[type=checkbox]").attr('checked', false);
-  $(this).siblings("input[type=checkbox]").attr('checked', true);
+  $("#search-types input[type=checkbox]").prop('checked', false);
+  $(this).siblings("input[type=checkbox]").prop('checked', true);
   if ($("#search-input").val() != "") {
     $("#search-form").submit();
   }
diff --git a/app/views/wiki/destroy.html.erb b/app/views/wiki/destroy.html.erb
index 08d2cc2bb..eebe250ca 100644
--- a/app/views/wiki/destroy.html.erb
+++ b/app/views/wiki/destroy.html.erb
@@ -12,7 +12,7 @@
 <label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_wiki_page_reassign_children) %></label>:
 <%= label_tag "reassign_to_id", l(:description_wiki_subpages_reassign), :class => "hidden-for-sighted" %>
 <%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to),
-                                 :onclick => "$('#todo_reassign').attr('checked', true);" %>
+                                 :onclick => "$('#todo_reassign').prop('checked', true);" %>
 <% end %>
 </p>
 </div>
diff --git a/app/views/wiki/history.html.erb b/app/views/wiki/history.html.erb
index 56a447855..ebac6d514 100644
--- a/app/views/wiki/history.html.erb
+++ b/app/views/wiki/history.html.erb
@@ -21,7 +21,7 @@
 <% @versions.each do |ver| %>
 <tr class="wiki-page-version <%= cycle("odd", "even") %>">
     <td class="id"><%= link_to h(ver.version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
-    <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').attr('checked', true);") if show_diff && (line_num < @versions.size) %></td>
+    <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('#cbto-#{line_num+1}').prop('checked', true);") if show_diff && (line_num < @versions.size) %></td>
     <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
     <td class="updated_on"><%= format_time(ver.updated_on) %></td>
     <td class="author"><%= link_to_user ver.author %></td>