jro_apps/redmine Commit - r13045:cc688bb1b114

Backport r13313 from rails-4.1 to trunk....

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

Toshi MARUYAMA - Sun, 14 Sep 2014 14:17:52

r13045:cc688bb1b114

parent child

Diff options:

Raw Diff | Patch Diff | Download Diff

Side by Side Unified

Hide whitespace changes

Show full context diff

Context file:

r13045:cc688bb1b114 Loading diff...:

Expand all files

The requested changes are too big and content was truncated. Show full diff

public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-3.1.1.js

¶ permalink

public/javascripts/jquery-1.11.1-ui-1.11.0-ujs-3.1.1.js limited diff created 644 0 0

Show file before | Show file after | Hide comments

	1		NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

public/stylesheets/jquery/images/animated-overlay.gif

¶ permalink

public/stylesheets/jquery/images/animated-overlay.gif created 644 binary 0 0

Show file before | Show file after | Hide comments

NO CONTENT: new file 100644, binary diff hidden

public/stylesheets/jquery/jquery-ui-1.11.0.css

¶ permalink

public/stylesheets/jquery/jquery-ui-1.11.0.css limited diff created 644 0 0

Show file before | Show file after | Hide comments

	1		NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff

Gemfile

¶ permalink

Gemfile +1 -1

Show file before | Show file after | Hide comments

              source 'https://rubygems.org'
              gem "rails", "3.2.19"
-             gem "jquery-rails", "~> 2.0.2"
+             gem "jquery-rails", "~> 3.1.1"
              gem "coderay", "~> 1.1.0"
              gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
              gem "builder", ">= 3.0.4"

app/helpers/application_helper.rb

¶ permalink

app/helpers/application_helper.rb +1 -1

Show file before | Show file after | Hide comments

                # 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

app/views/issues/bulk_edit.html.erb

¶ permalink

app/views/issues/bulk_edit.html.erb +1 -1

Show file before | Show file after | Hide comments

              <%= 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);

app/views/journals/new.js.erb

¶ permalink

app/views/journals/new.js.erb +1 -1

Show file before | Show file after | Hide comments

                # 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");

app/views/layouts/base.html.erb

¶ permalink

app/views/layouts/base.html.erb +1 -1

Show file before | Show file after | Hide comments

              <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 %>

app/views/projects/_form.html.erb

¶ permalink

app/views/projects/_form.html.erb +1 -1

Show file before | Show file after | Hide comments

              <%= 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();

app/views/repositories/_revisions.html.erb

¶ permalink

app/views/repositories/_revisions.html.erb +2 -2

Show file before | Show file after | Hide comments

              <%= 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>

app/views/search/index.html.erb

¶ permalink

app/views/search/index.html.erb +2 -2

Show file before | Show file after | Hide comments

              <%= 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();
                }

app/views/wiki/destroy.html.erb

¶ permalink

app/views/wiki/destroy.html.erb +1 -1

Show file before | Show file after | Hide comments

              <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>

app/views/wiki/history.html.erb

¶ permalink

app/views/wiki/history.html.erb +1 -1

Show file before | Show file after | Hide comments

              <% @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>

public/javascripts/application.js

¶ permalink

public/javascripts/application.js +5 -5

Show file before | Show file after | Hide comments

                 Copyright (C) 2006-2014  Jean-Philippe Lang */
              function checkAll(id, checked) {
-               $('#'+id).find('input[type=checkbox]:enabled').attr('checked', checked);
+               $('#'+id).find('input[type=checkbox]:enabled').prop('checked', checked);
              }
              function toggleCheckboxesBySelector(selector) {
                $(selector).each(function(index) {
                  if (!$(this).is(':checked')) { all_checked = false; }
                });
-               $(selector).attr('checked', !all_checked);
+               $(selector).prop('checked', !all_checked);
              }
              function showAndScrollTo(id, focus) {
                } else {
                  buildFilterRow(field, operator, values);
                }
-               $('#cb_'+fieldId).attr('checked', true);
+               $('#cb_'+fieldId).prop('checked', true);
                toggleFilter(field);
                $('#add_filter_select').val('').children('option').each(function() {
                  if ($(this).attr('value') == field) {
              }
              function setupAjaxIndicator() {
-               $('#ajax-indicator').bind('ajaxSend', function(event, xhr, settings) {
+               $(document).bind('ajaxSend', function(event, xhr, settings) {
                  if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
                    $('#ajax-indicator').show();
                  }
                });
-               $('#ajax-indicator').bind('ajaxStop', function() {
+               $(document).bind('ajaxStop', function() {
                  $('#ajax-indicator').hide();
                });
              }

public/javascripts/context_menu.js

¶ permalink

public/javascripts/context_menu.js +5 -5

Show file before | Show file after | Hide comments

                    // a row was clicked, check if the click was on checkbox
                    if (target.is('input')) {
                      // a checkbox may be clicked
-                     if (target.attr('checked')) {
+                     if (target.prop('checked')) {
                        tr.addClass('context-menu-selection');
                      } else {
                        tr.removeClass('context-menu-selection');
              }
              function contextMenuCheckSelectionBox(tr, checked) {
-               tr.find('input[type=checkbox]').attr('checked', checked);
+               tr.find('input[type=checkbox]').prop('checked', checked);
              }
              function contextMenuClearDocumentSelection() {
              function toggleIssuesSelection(el) {
                var boxes = $(el).parents('form').find('input[type=checkbox]');
                var all_checked = true;
-               boxes.each(function(){ if (!$(this).attr('checked')) { all_checked = false; } });
+               boxes.each(function(){ if (!$(this).prop('checked')) { all_checked = false; } });
                boxes.each(function(){
                  if (all_checked) {
                    $(this).removeAttr('checked');
                    $(this).parents('tr').removeClass('context-menu-selection');
-                 } else if (!$(this).attr('checked')) {
-                   $(this).attr('checked', true);
+                 } else if (!$(this).prop('checked')) {
+                   $(this).prop('checked', true);
                    $(this).parents('tr').addClass('context-menu-selection');
                  }
                });

public/javascripts/gantt.js

¶ permalink

public/javascripts/gantt.js +2 -2

Show file before | Show file after | Hide comments

                else
                  draw_gantt = Raphael(folder);
                setDrawArea();
-               if ($("#draw_progress_line").attr('checked'))
+               if ($("#draw_progress_line").prop('checked'))
                  drawGanttProgressLines();
-               if ($("#draw_relations").attr('checked'))
+               if ($("#draw_relations").prop('checked'))
                  drawRelations();
              }

public/stylesheets/jquery/images/ui-bg_diagonals-thick_18_b81900_40x40.png

¶ permalink

public/stylesheets/jquery/images/ui-bg_diagonals-thick_18_b81900_40x40.png binary modified 0 0

Show file before | Show file after | Hide comments