consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Focus the proposal selection switch after pressing it

Browse Source 
Since this button is replaced by a new element in an AJAX call, nothing
was focused after pressing it.

So we're reusing the code we used to enable/disable budget phases, which
already dealt with this issue.
This commit is contained in:
Javi Martín
2024-10-06 13:15:08 +02:00
parent 2acaa14705
commit 02b6302f25
6 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/admin/budgets_wizard/phases/toggle_enabled.js.erb
View File

@@ -1,5 +1,3 @@
var replacement = $("<%= j render Admin::BudgetPhases::ToggleEnabledComponent.new(@phase) %>");
var form = $("#<%= dom_id(@phase) %> .toggle-switch");
form.replaceWith(replacement);
replacement.find("[type='submit']").focus();
<%= render "admin/shared/toggle_switch",
record: @phase,
new_content: render(Admin::BudgetPhases::ToggleEnabledComponent.new(@phase)) %>

2
app/views/admin/legislation/proposals/_proposals.html.erb
View File

@@ -19,7 +19,7 @@
<td class="text-center"><%= proposal.id %></td>
<td><%= proposal.title %></td>
<td class="text-center"><%= proposal.votes_score %></td>
<td class="select"><%= render Admin::Proposals::ToggleSelectionComponent.new(proposal) %></td>
<td><%= render Admin::Proposals::ToggleSelectionComponent.new(proposal) %></td>
</tr>
<% end %>
</tbody>

6
app/views/admin/legislation/proposals/toggle_selection.js.erb
View File

@@ -1,3 +1,3 @@
$("#<%= dom_id(@proposal) %> .select").html(
"<%= j render(Admin::Proposals::ToggleSelectionComponent.new(@proposal)) %>"
);
<%= render "admin/shared/toggle_switch",
record: @proposal,
new_content: render(Admin::Proposals::ToggleSelectionComponent.new(@proposal)) %>

2
app/views/admin/proposals/index.html.erb
View File

@@ -27,7 +27,7 @@
<td><%= link_to proposal.title, admin_proposal_path(proposal) %></td>
<td><%= proposal.author.username %></td>
<td><%= proposal.milestones.count %></td>
<td class="js-select"><%= render Admin::Proposals::ToggleSelectionComponent.new(proposal) %></td>
<td><%= render Admin::Proposals::ToggleSelectionComponent.new(proposal) %></td>
</tr>
<% end %>
</tbody>

6
app/views/admin/proposals/toggle_selection.js.erb
View File

@@ -1,3 +1,3 @@
$("#<%= dom_id(@proposal) %> .js-select").html(
"<%= j render(Admin::Proposals::ToggleSelectionComponent.new(@proposal)) %>"
);
<%= render "admin/shared/toggle_switch",
record: @proposal,
new_content: render(Admin::Proposals::ToggleSelectionComponent.new(@proposal)) %>

5
app/views/admin/shared/_toggle_switch.js.erb Normal file
View File

@@ -0,0 +1,5 @@
var new_toggle_switch = $("<%= j new_content %>");
var current_toggle_switch = $("#<%= dom_id(record) %> .toggle-switch");
current_toggle_switch.replaceWith(new_toggle_switch);
new_toggle_switch.find("[type='submit']").focus();