From 99f8bb44911647cce645be66875b0e71ddc41a03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sen=C3=A9n=20Rodero=20Rodr=C3=ADguez?= Date: Tue, 28 Jul 2020 11:15:09 +0200 Subject: [PATCH] Fix collission with `sortable.js` script TableSortable and Sortable javascripts were using the same CSS class name to define completely different and separated behaviours causing unexpected errors. Now `sortable.js` script will use `.sortable` class and `table_sortable.js` will use `.table-sortable` instead. --- app/assets/javascripts/table_sortable.js | 2 +- app/views/admin/stats/polls.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/table_sortable.js b/app/assets/javascripts/table_sortable.js index f5aa31b74..282f5d42b 100644 --- a/app/assets/javascripts/table_sortable.js +++ b/app/assets/javascripts/table_sortable.js @@ -17,7 +17,7 @@ }; }, initialize: function() { - $("table.sortable th").on("click", function() { + $(".table-sortable th").on("click", function() { var rows, table; table = $(this).parents("table").eq(0); rows = table.find("tbody tr").toArray().sort(App.TableSortable.comparer($(this).index())); diff --git a/app/views/admin/stats/polls.html.erb b/app/views/admin/stats/polls.html.erb index d40e4280b..178d06bcb 100644 --- a/app/views/admin/stats/polls.html.erb +++ b/app/views/admin/stats/polls.html.erb @@ -25,7 +25,7 @@

<%= t("admin.stats.polls.all") %>

- +
@@ -52,7 +52,7 @@

<%= t("admin.stats.polls.poll_questions", poll: poll.name) %>

-
<%= t("admin.stats.polls.table.poll_name") %>
+
<%= t("admin.stats.polls.table.question_name") %>