Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-15 09:46:02 +01:00
Code Issues Packages Projects Releases Activity

Clean up toggleMultiSelect js function (#32813).

Browse Source 
Patch by Mizuki ISHIKAWA.


git-svn-id: http://svn.redmine.org/redmine/trunk@19604 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2020-03-22 05:25:39 +00:00
parent 6acc439704
commit fb7d3bf7ce
3 changed files with 25 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/views/workflows/edit.html.erb
View File

@@ -15,13 +15,13 @@
<p>
<label><%=l(:label_role)%>:
<%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %>
<span class="toggle-multiselect icon-only"></span>
</label>
<a href="#" data-expands="#role_id"><span class="toggle-multiselect icon-only icon-toggle-plus"></span></a>
<label><%=l(:label_tracker)%>:
<%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %>
<span class="toggle-multiselect icon-only"></span>
</label>
<a href="#" data-expands="#tracker_id"><span class="toggle-multiselect icon-only icon-toggle-plus"></span></a>
<%= submit_tag l(:button_edit), :name => nil %>
@@ -58,20 +58,3 @@
<%= submit_tag l(:button_save) %>
<% end %>
<% end %>
<%= javascript_tag do %>
$("a[data-expands]").click(function(e){
e.preventDefault();
var target = $($(this).attr("data-expands"));
if (target.attr("multiple")) {
$(this).find('span').switchClass('icon-toggle-minus', 'icon-toggle-plus');
target.attr("multiple", false);
target.find("option[value=all]").show();
} else {
$(this).find('span').switchClass('icon-toggle-plus', 'icon-toggle-minus');
target.attr("multiple", true);
target.find("option[value=all]").attr("selected", false).hide();
}
});
<% end %>

20
app/views/workflows/permissions.html.erb
View File

@@ -15,14 +15,13 @@
<p>
<label><%=l(:label_role)%>:
<%= options_for_workflow_select 'role_id[]', Role.sorted.select(&:consider_workflow?), @roles, :id => 'role_id', :class => 'expandable' %>
<span class="toggle-multiselect icon-only"></span>
</label>
<a href="#" data-expands="#role_id"><span class="toggle-multiselect icon-only icon-toggle-plus"></span></a>
<label><%=l(:label_tracker)%>:
<%= options_for_workflow_select 'tracker_id[]', Tracker.sorted, @trackers, :id => 'tracker_id', :class => 'expandable' %>
<span class="toggle-multiselect icon-only"></span>
</label>
<a href="#" data-expands="#tracker_id"><span class="toggle-multiselect icon-only icon-toggle-plus"></span></a>
<%= submit_tag l(:button_edit), :name => nil %>
<%= hidden_field_tag 'used_statuses_only', '0', :id => nil %>
@@ -107,19 +106,4 @@ $("a.repeat-value").click(function(e){
var selected = td.find("select").find(":selected").val();
td.nextAll('td').find("select").val(selected);
});
$("a[data-expands]").click(function(e){
e.preventDefault();
var target = $($(this).attr("data-expands"));
if (target.attr("multiple")) {
$(this).find('span').switchClass('icon-toggle-minus', 'icon-toggle-plus');
target.attr("multiple", false);
target.find("option[value=all]").show();
} else {
$(this).find('span').switchClass('icon-toggle-plus', 'icon-toggle-minus');
target.attr("multiple", true);
target.find("option[value=all]").attr("selected", false).hide();
}
});
<% end %>

25
public/javascripts/application.js
View File

@@ -120,10 +120,6 @@ function initFilters() {
$('#filters-table').on('click', 'td.field input[type=checkbox]', function() {
toggleFilter($(this).val());
});
$('#filters-table').on('click', '.toggle-multiselect', function() {
toggleMultiSelect($(this).siblings('select'))
$(this).toggleClass('icon-toggle-plus icon-toggle-minus')
});
$('#filters-table').on('keypress', 'input[type=text]', function(e) {
if (e.keyCode == 13) $(this).closest('form').submit();
});
@@ -151,6 +147,7 @@ function addFilter(field, operator, values) {
}
$('#cb_'+fieldId).prop('checked', true);
toggleFilter(field);
toggleMultiSelectIconInit();
$('#add_filter_select').val('').find('option').each(function() {
if ($(this).attr('value') == field) {
$(this).attr('disabled', true);
@@ -189,7 +186,7 @@ function buildFilterRow(field, operator, values) {
case "list_subprojects":
tr.find('td.values').append(
'<span style="display:none;"><select class="value" id="values_'+fieldId+'_1" name="v['+field+'][]"></select>' +
' <span class="toggle-multiselect icon-only icon-toggle-plus">&nbsp;</span></span>'
' <span class="toggle-multiselect icon-only '+(values.length > 1 ? 'icon-toggle-minus' : 'icon-toggle-plus')+'">&nbsp;</span></span>'
);
select = tr.find('td.values select');
if (values.length > 1) { select.attr('multiple', true); }
@@ -336,11 +333,14 @@ function toggleOperator(field) {
}
function toggleMultiSelect(el) {
var isWorkflow = el.closest('.controller-workflows');
if (el.attr('multiple')) {
el.removeAttr('multiple');
if (isWorkflow) { el.find("option[value=all]").show(); }
el.attr('size', 1);
} else {
el.attr('multiple', true);
if (isWorkflow) { el.find("option[value=all]").attr("selected", false).hide(); }
if (el.children().length > 10)
el.attr('size', 10);
else
@@ -891,6 +891,15 @@ function toggleDisabledOnChange() {
function toggleDisabledInit() {
$('input[data-disables], input[data-enables], input[data-shows]').each(toggleDisabledOnChange);
}
function toggleMultiSelectIconInit() {
$('.toggle-multiselect:not(.icon-toggle-minus), .toggle-multiselect:not(.icon-toggle-plus)').each(function(){
if ($(this).siblings('select').find('option:selected').size() > 1){
$(this).addClass('icon-toggle-minus');
} else {
$(this).addClass('icon-toggle-plus');
}
});
}
function toggleNewObjectDropdown() {
var dropdown = $('#new-object + ul.menu-children');
@@ -931,6 +940,12 @@ $(document).ready(function(){
$('#content').on('change', 'input[data-disables], input[data-enables], input[data-shows]', toggleDisabledOnChange);
toggleDisabledInit();
$('#content').on('click', '.toggle-multiselect', function() {
toggleMultiSelect($(this).siblings('select'));
$(this).toggleClass('icon-toggle-plus icon-toggle-minus');
});
toggleMultiSelectIconInit();
$('#history .tabs').on('click', 'a', function(e){
var tab = $(e.target).attr('id').replace('tab-','');
document.cookie = 'history_last_tab=' + tab