fix: Separate JS for base scoreboard and custom levels table (#1729)

* fix: Separate JS for base scoreboard and custom levels table * Load script only if RR
ocadotechnology · Sep 16, 2024 · 1c6ef47 · 1c6ef47
1 parent 1346896
commit 1c6ef47
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 56 deletions.
diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/game/static/game/js/scoreboard.js b/game/static/game/js/scoreboard.js
@@ -69,49 +69,12 @@ $(document).ready(function () {
       $(".previous").removeClass("paginate_button");
     });
 
-    // Setup shared levels table
-    let sharedLevelsTable = $("#sharedLevelsTable").DataTable({
-      scrollY: false,
-      scrollX: true,
-      scrollCollapse: false,
-      paging: true,
-      deferRender: true,
-      language: {
-        emptyTable: "No data available in table",
-        loadingRecords: "Loading...",
-        processing: "Processing...",
-        search: "Search:",
-        zeroRecords: "No matching records found"
-      },
-      columnDefs: [
-        {
-          orderable: false,
-          targets: "no-sort"
-        }
-      ]
-    });
-
-    new $.fn.dataTable.FixedColumns(sharedLevelsTable, {
-      leftColumns: 2,
-    });
-
-    $("#sharedLevelsTable_next").append(" >");
-
-    sharedLevelsTable.on("draw", () => {
-      $("#sharedLevelsTable_next").append(" >");
-      $("#sharedLevelsTable_previous").prepend("< ");
-      $(".next").removeClass("paginate_button");
-      $(".previous").removeClass("paginate_button");
-    });
-
     $("#scoreboardSearch").on("keyup", function () {
       table.search(this.value).draw();
-      sharedLevelsTable.search(this.value).draw();
     });
 
     $(window).on("load", function () {
       table.columns.adjust();
-      sharedLevelsTable.columns.adjust();
     });
   }
 

diff --git a/game/static/game/js/scoreboardSharedLevels.js b/game/static/game/js/scoreboardSharedLevels.js
@@ -0,0 +1,48 @@
+$(document).ready(function () {
+  let scoreboardPresent = document.getElementById("scoreboardTable") !== null;
+
+  if (scoreboardPresent) {
+    // Setup shared levels table
+    let sharedLevelsTable = $("#sharedLevelsTable").DataTable({
+      scrollY: false,
+      scrollX: true,
+      scrollCollapse: false,
+      paging: true,
+      deferRender: true,
+      language: {
+        emptyTable: "No data available in table",
+        loadingRecords: "Loading...",
+        processing: "Processing...",
+        search: "Search:",
+        zeroRecords: "No matching records found"
+      },
+      columnDefs: [
+        {
+          orderable: false,
+          targets: "no-sort"
+        }
+      ]
+    });
+
+    new $.fn.dataTable.FixedColumns(sharedLevelsTable, {
+      leftColumns: 2,
+    });
+
+    $("#sharedLevelsTable_next").append(" >");
+
+    sharedLevelsTable.on("draw", () => {
+      $("#sharedLevelsTable_next").append(" >");
+      $("#sharedLevelsTable_previous").prepend("< ");
+      $(".next").removeClass("paginate_button");
+      $(".previous").removeClass("paginate_button");
+    });
+
+    $("#scoreboardSearch").on("keyup", function () {
+      sharedLevelsTable.search(this.value).draw();
+    });
+
+    $(window).on("load", function () {
+      sharedLevelsTable.columns.adjust();
+    });
+  }
+});
diff --git a/game/templates/game/scoreboard.html b/game/templates/game/scoreboard.html
@@ -20,6 +20,9 @@
     <script src="{% static 'game/js/pqselect.min.js' %}"></script>
     <script src="{% static 'game/js/jquery.outerhtml.js' %}"></script>
     <script src="{% static 'game/js/scoreboard.js' %}"></script>
+    {% if language == "blockly" %}
+        <script src="{% static 'game/js/scoreboardSharedLevels.js' %}"></script>
+    {% endif %}
 {% endblock %}
 
 {% block css %}