##// END OF EJS Templates
Backport r13313 from rails-4.1 to trunk....
Toshi MARUYAMA -
r13045:cc688bb1b114
parent child
Show More

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

1 NO CONTENT: new file 100644
NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
1 NO CONTENT: new file 100644
NO CONTENT: new file 100644
The requested commit or file is too big and content was truncated. Show full diff
@@ -1,7 +1,7
1 source 'https://rubygems.org'
1 source 'https://rubygems.org'
2
2
3 gem "rails", "3.2.19"
3 gem "rails", "3.2.19"
4 gem "jquery-rails", "~> 2.0.2"
4 gem "jquery-rails", "~> 3.1.1"
5 gem "coderay", "~> 1.1.0"
5 gem "coderay", "~> 1.1.0"
6 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
6 gem "fastercsv", "~> 1.5.0", :platforms => [:mri_18, :mingw_18, :jruby]
7 gem "builder", ">= 3.0.4"
7 gem "builder", ">= 3.0.4"
@@ -1295,7 +1295,7 module ApplicationHelper
1295
1295
1296 # Returns the javascript tags that are included in the html layout head
1296 # Returns the javascript tags that are included in the html layout head
1297 def javascript_heads
1297 def javascript_heads
1298 tags = javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application')
1298 tags = javascript_include_tag('jquery-1.11.1-ui-1.11.0-ujs-3.1.1', 'application')
1299 unless User.current.pref.warn_on_leaving_unsaved == '0'
1299 unless User.current.pref.warn_on_leaving_unsaved == '0'
1300 tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
1300 tags << "\n".html_safe + javascript_tag("$(window).load(function(){ warnLeavingUnsaved('#{escape_javascript l(:text_warn_on_leaving_unsaved)}'); });")
1301 end
1301 end
@@ -185,7 +185,7
185 <%= javascript_tag do %>
185 <%= javascript_tag do %>
186 $(window).load(function(){
186 $(window).load(function(){
187 $(document).on('change', 'input[data-disables]', function(){
187 $(document).on('change', 'input[data-disables]', function(){
188 if ($(this).attr('checked')){
188 if ($(this).prop('checked')){
189 $($(this).data('disables')).attr('disabled', true).val('');
189 $($(this).data('disables')).attr('disabled', true).val('');
190 } else {
190 } else {
191 $($(this).data('disables')).attr('disabled', false);
191 $($(this).data('disables')).attr('disabled', false);
@@ -3,7 +3,7 $('#issue_notes').val("<%= raw escape_javascript(@content) %>");
3 # when quoting a private journal, check the private checkbox
3 # when quoting a private journal, check the private checkbox
4 if @journal && @journal.private_notes?
4 if @journal && @journal.private_notes?
5 %>
5 %>
6 $('#issue_private_notes').attr('checked', true);
6 $('#issue_private_notes').prop('checked', true);
7 <% end %>
7 <% end %>
8
8
9 showAndScrollTo("update", "notes");
9 showAndScrollTo("update", "notes");
@@ -7,7 +7,7
7 <meta name="keywords" content="issue,bug,tracker" />
7 <meta name="keywords" content="issue,bug,tracker" />
8 <%= csrf_meta_tag %>
8 <%= csrf_meta_tag %>
9 <%= favicon %>
9 <%= favicon %>
10 <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', :media => 'all' %>
10 <%= stylesheet_link_tag 'jquery/jquery-ui-1.11.0', 'application', :media => 'all' %>
11 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
11 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
12 <%= javascript_heads %>
12 <%= javascript_heads %>
13 <%= heads_for_theme %>
13 <%= heads_for_theme %>
@@ -92,7 +92,7
92 <%= javascript_tag do %>
92 <%= javascript_tag do %>
93 $(document).ready(function() {
93 $(document).ready(function() {
94 $('#project_enabled_module_names_issue_tracking').on('change', function(){
94 $('#project_enabled_module_names_issue_tracking').on('change', function(){
95 if ($(this).attr('checked')){
95 if ($(this).prop('checked')){
96 $('#project_trackers, #project_issue_custom_fields').show();
96 $('#project_trackers, #project_issue_custom_fields').show();
97 } else {
97 } else {
98 $('#project_trackers, #project_issue_custom_fields').hide();
98 $('#project_trackers, #project_issue_custom_fields').hide();
@@ -37,8 +37,8 end %>
37 <%= content_tag(:td, :class => 'id', :style => id_style) do %>
37 <%= content_tag(:td, :class => 'id', :style => id_style) do %>
38 <%= link_to_revision(changeset, @repository) %>
38 <%= link_to_revision(changeset, @repository) %>
39 <% end %>
39 <% end %>
40 <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>
40 <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>
41 <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>
41 <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>
42 <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
42 <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
43 <td class="author"><%= changeset.author.to_s.truncate(30) %></td>
43 <td class="author"><%= changeset.author.to_s.truncate(30) %></td>
44 <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
44 <td class="comments"><%= textilizable(truncate_at_line_break(changeset.comments)) %></td>
@@ -56,8 +56,8
56 <%= javascript_tag do %>
56 <%= javascript_tag do %>
57 $("#search-types a").click(function(e){
57 $("#search-types a").click(function(e){
58 e.preventDefault();
58 e.preventDefault();
59 $("#search-types input[type=checkbox]").attr('checked', false);
59 $("#search-types input[type=checkbox]").prop('checked', false);
60 $(this).siblings("input[type=checkbox]").attr('checked', true);
60 $(this).siblings("input[type=checkbox]").prop('checked', true);
61 if ($("#search-input").val() != "") {
61 if ($("#search-input").val() != "") {
62 $("#search-form").submit();
62 $("#search-form").submit();
63 }
63 }
@@ -12,7 +12,7
12 <label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_wiki_page_reassign_children) %></label>:
12 <label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_wiki_page_reassign_children) %></label>:
13 <%= label_tag "reassign_to_id", l(:description_wiki_subpages_reassign), :class => "hidden-for-sighted" %>
13 <%= label_tag "reassign_to_id", l(:description_wiki_subpages_reassign), :class => "hidden-for-sighted" %>
14 <%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to),
14 <%= select_tag 'reassign_to_id', wiki_page_options_for_select(@reassignable_to),
15 :onclick => "$('#todo_reassign').attr('checked', true);" %>
15 :onclick => "$('#todo_reassign').prop('checked', true);" %>
16 <% end %>
16 <% end %>
17 </p>
17 </p>
18 </div>
18 </div>
@@ -21,7 +21,7
21 <% @versions.each do |ver| %>
21 <% @versions.each do |ver| %>
22 <tr class="wiki-page-version <%= cycle("odd", "even") %>">
22 <tr class="wiki-page-version <%= cycle("odd", "even") %>">
23 <td class="id"><%= link_to h(ver.version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
23 <td class="id"><%= link_to h(ver.version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td>
24 <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>
24 <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>
25 <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
25 <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td>
26 <td class="updated_on"><%= format_time(ver.updated_on) %></td>
26 <td class="updated_on"><%= format_time(ver.updated_on) %></td>
27 <td class="author"><%= link_to_user ver.author %></td>
27 <td class="author"><%= link_to_user ver.author %></td>
@@ -2,7 +2,7
2 Copyright (C) 2006-2014 Jean-Philippe Lang */
2 Copyright (C) 2006-2014 Jean-Philippe Lang */
3
3
4 function checkAll(id, checked) {
4 function checkAll(id, checked) {
5 $('#'+id).find('input[type=checkbox]:enabled').attr('checked', checked);
5 $('#'+id).find('input[type=checkbox]:enabled').prop('checked', checked);
6 }
6 }
7
7
8 function toggleCheckboxesBySelector(selector) {
8 function toggleCheckboxesBySelector(selector) {
@@ -10,7 +10,7 function toggleCheckboxesBySelector(selector) {
10 $(selector).each(function(index) {
10 $(selector).each(function(index) {
11 if (!$(this).is(':checked')) { all_checked = false; }
11 if (!$(this).is(':checked')) { all_checked = false; }
12 });
12 });
13 $(selector).attr('checked', !all_checked);
13 $(selector).prop('checked', !all_checked);
14 }
14 }
15
15
16 function showAndScrollTo(id, focus) {
16 function showAndScrollTo(id, focus) {
@@ -100,7 +100,7 function addFilter(field, operator, values) {
100 } else {
100 } else {
101 buildFilterRow(field, operator, values);
101 buildFilterRow(field, operator, values);
102 }
102 }
103 $('#cb_'+fieldId).attr('checked', true);
103 $('#cb_'+fieldId).prop('checked', true);
104 toggleFilter(field);
104 toggleFilter(field);
105 $('#add_filter_select').val('').children('option').each(function() {
105 $('#add_filter_select').val('').children('option').each(function() {
106 if ($(this).attr('value') == field) {
106 if ($(this).attr('value') == field) {
@@ -555,12 +555,12 function warnLeavingUnsaved(message) {
555 }
555 }
556
556
557 function setupAjaxIndicator() {
557 function setupAjaxIndicator() {
558 $('#ajax-indicator').bind('ajaxSend', function(event, xhr, settings) {
558 $(document).bind('ajaxSend', function(event, xhr, settings) {
559 if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
559 if ($('.ajax-loading').length === 0 && settings.contentType != 'application/octet-stream') {
560 $('#ajax-indicator').show();
560 $('#ajax-indicator').show();
561 }
561 }
562 });
562 });
563 $('#ajax-indicator').bind('ajaxStop', function() {
563 $(document).bind('ajaxStop', function() {
564 $('#ajax-indicator').hide();
564 $('#ajax-indicator').hide();
565 });
565 });
566 }
566 }
@@ -31,7 +31,7 function contextMenuClick(event) {
31 // a row was clicked, check if the click was on checkbox
31 // a row was clicked, check if the click was on checkbox
32 if (target.is('input')) {
32 if (target.is('input')) {
33 // a checkbox may be clicked
33 // a checkbox may be clicked
34 if (target.attr('checked')) {
34 if (target.prop('checked')) {
35 tr.addClass('context-menu-selection');
35 tr.addClass('context-menu-selection');
36 } else {
36 } else {
37 tr.removeClass('context-menu-selection');
37 tr.removeClass('context-menu-selection');
@@ -180,7 +180,7 function contextMenuIsSelected(tr) {
180 }
180 }
181
181
182 function contextMenuCheckSelectionBox(tr, checked) {
182 function contextMenuCheckSelectionBox(tr, checked) {
183 tr.find('input[type=checkbox]').attr('checked', checked);
183 tr.find('input[type=checkbox]').prop('checked', checked);
184 }
184 }
185
185
186 function contextMenuClearDocumentSelection() {
186 function contextMenuClearDocumentSelection() {
@@ -207,13 +207,13 function contextMenuInit(url) {
207 function toggleIssuesSelection(el) {
207 function toggleIssuesSelection(el) {
208 var boxes = $(el).parents('form').find('input[type=checkbox]');
208 var boxes = $(el).parents('form').find('input[type=checkbox]');
209 var all_checked = true;
209 var all_checked = true;
210 boxes.each(function(){ if (!$(this).attr('checked')) { all_checked = false; } });
210 boxes.each(function(){ if (!$(this).prop('checked')) { all_checked = false; } });
211 boxes.each(function(){
211 boxes.each(function(){
212 if (all_checked) {
212 if (all_checked) {
213 $(this).removeAttr('checked');
213 $(this).removeAttr('checked');
214 $(this).parents('tr').removeClass('context-menu-selection');
214 $(this).parents('tr').removeClass('context-menu-selection');
215 } else if (!$(this).attr('checked')) {
215 } else if (!$(this).prop('checked')) {
216 $(this).attr('checked', true);
216 $(this).prop('checked', true);
217 $(this).parents('tr').addClass('context-menu-selection');
217 $(this).parents('tr').addClass('context-menu-selection');
218 }
218 }
219 });
219 });
@@ -165,8 +165,8 function drawGanttHandler() {
165 else
165 else
166 draw_gantt = Raphael(folder);
166 draw_gantt = Raphael(folder);
167 setDrawArea();
167 setDrawArea();
168 if ($("#draw_progress_line").attr('checked'))
168 if ($("#draw_progress_line").prop('checked'))
169 drawGanttProgressLines();
169 drawGanttProgressLines();
170 if ($("#draw_relations").attr('checked'))
170 if ($("#draw_relations").prop('checked'))
171 drawRelations();
171 drawRelations();
172 }
172 }
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
1 NO CONTENT: file was removed
NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff
1 NO CONTENT: file was removed
NO CONTENT: file was removed
The requested commit or file is too big and content was truncated. Show full diff
General Comments 0
You need to be logged in to leave comments. Login now