Merge pull request #1838 from pi-hole/tweak/trailing-commas-js

Prettier improvements for easier reviews
pi-hole · Jun 23, 2021 · ca030bc · ca030bc
2 parents a2c64d6 + 0d0a8db
commit ca030bc
Show file tree

Hide file tree

Showing 20 changed files with 192 additions and 192 deletions.
diff --git a/package.json b/package.json
@@ -40,7 +40,7 @@
     "endOfLine": "auto",
     "printWidth": 100,
     "singleQuote": false,
-    "trailingComma": "none"
+    "trailingComma": "es5"
   },
   "xo": {
     "envs": [

diff --git a/scripts/pi-hole/js/auditlog.js b/scripts/pi-hole/js/auditlog.js
@@ -100,14 +100,14 @@ function add(domain, list) {
       list: list,
       token: token,
       action: list === "audit" ? "add_audit" : "add_domain",
-      comment: "Added from Audit Log"
+      comment: "Added from Audit Log",
     },
     success: function () {
       updateTopLists();
     },
     error: function (jqXHR, exception) {
       console.log(exception); // eslint-disable-line no-console
-    }
+    },
   });
 }
 

diff --git a/scripts/pi-hole/js/customcname.js b/scripts/pi-hole/js/customcname.js
@@ -46,7 +46,7 @@ $(function () {
     ajax: {
       url: "scripts/pi-hole/php/customcname.php",
       data: { action: "get", token: token },
-      type: "POST"
+      type: "POST",
     },
     columns: [{}, {}, { orderable: false, searchable: false }],
     columnDefs: [
@@ -62,12 +62,12 @@ $(function () {
             '<span class="far fa-trash-alt"></span>' +
             "</button>"
           );
-        }
-      }
+        },
+      },
     ],
     lengthMenu: [
       [10, 25, 50, 100, -1],
-      [10, 25, 50, 100, "All"]
+      [10, 25, 50, 100, "All"],
     ],
     order: [[0, "asc"]],
     stateSave: true,
@@ -79,7 +79,7 @@ $(function () {
     },
     drawCallback: function () {
       $(".deleteCustomCNAME").on("click", deleteCustomCNAME);
-    }
+    },
   });
   // Disable autocorrect in the search box
   var input = document.querySelector("input[type=search]");
@@ -107,7 +107,7 @@ function addCustomCNAME() {
     },
     error: function () {
       showAlert("error", "Error while adding this custom CNAME record");
-    }
+    },
   });
 }
 
@@ -130,6 +130,6 @@ function deleteCustomCNAME() {
     error: function (jqXHR, exception) {
       showAlert("error", "Error while deleting this custom CNAME record");
       console.log(exception); // eslint-disable-line no-console
-    }
+    },
   });
 }
diff --git a/scripts/pi-hole/js/customdns.js b/scripts/pi-hole/js/customdns.js
@@ -46,7 +46,7 @@ $(function () {
     ajax: {
       url: "scripts/pi-hole/php/customdns.php",
       data: { action: "get", token: token },
-      type: "POST"
+      type: "POST",
     },
     columns: [{}, { type: "ip-address" }, { orderable: false, searchable: false }],
     columnDefs: [
@@ -62,12 +62,12 @@ $(function () {
             '<span class="far fa-trash-alt"></span>' +
             "</button>"
           );
-        }
-      }
+        },
+      },
     ],
     lengthMenu: [
       [10, 25, 50, 100, -1],
-      [10, 25, 50, 100, "All"]
+      [10, 25, 50, 100, "All"],
     ],
     order: [[0, "asc"]],
     stateSave: true,
@@ -79,7 +79,7 @@ $(function () {
     },
     drawCallback: function () {
       $(".deleteCustomDNS").on("click", deleteCustomDNS);
-    }
+    },
   });
   // Disable autocorrect in the search box
   var input = document.querySelector("input[type=search]");
@@ -107,7 +107,7 @@ function addCustomDNS() {
     },
     error: function () {
       showAlert("error", "Error while adding this custom DNS entry");
-    }
+    },
   });
 }
 
@@ -130,6 +130,6 @@ function deleteCustomDNS() {
     error: function (jqXHR, exception) {
       showAlert("error", "Error while deleting this custom DNS entry");
       console.log(exception); // eslint-disable-line no-console
-    }
+    },
   });
 }
diff --git a/scripts/pi-hole/js/db_graph.js b/scripts/pi-hole/js/db_graph.js
@@ -28,21 +28,21 @@ $(function () {
         Today: [moment().startOf("day"), moment()],
         Yesterday: [
           moment().subtract(1, "days").startOf("day"),
-          moment().subtract(1, "days").endOf("day")
+          moment().subtract(1, "days").endOf("day"),
         ],
         "Last 7 Days": [moment().subtract(6, "days"), moment()],
         "Last 30 Days": [moment().subtract(29, "days"), moment()],
         "This Month": [moment().startOf("month"), moment()],
         "Last Month": [
           moment().subtract(1, "month").startOf("month"),
-          moment().subtract(1, "month").endOf("month")
+          moment().subtract(1, "month").endOf("month"),
         ],
         "This Year": [moment().startOf("year"), moment()],
-        "All Time": [moment(0), moment()]
+        "All Time": [moment(0), moment()],
       },
       opens: "center",
       showDropdowns: true,
-      autoUpdateInput: false
+      autoUpdateInput: false,
     },
     function (startt, endt) {
       from = moment(startt).utc().valueOf() / 1000;
@@ -166,7 +166,7 @@ $(function () {
           pointRadius: 1,
           pointHoverRadius: 5,
           data: [],
-          pointHitRadius: 5
+          pointHitRadius: 5,
         },
         {
           label: "Permitted DNS Queries",
@@ -177,9 +177,9 @@ $(function () {
           pointRadius: 1,
           pointHoverRadius: 5,
           data: [],
-          pointHitRadius: 5
-        }
-      ]
+          pointHitRadius: 5,
+        },
+      ],
     },
     options: {
       tooltips: {
@@ -267,11 +267,11 @@ $(function () {
             }
 
             return data.datasets[tooltipItems.datasetIndex].label + ": " + tooltipItems.yLabel;
-          }
-        }
+          },
+        },
       },
       legend: {
-        display: false
+        display: false,
       },
       scales: {
         xAxes: [
@@ -287,22 +287,22 @@ $(function () {
                 week: "MMM DD",
                 month: "MMM",
                 quarter: "MMM",
-                year: "YYYY MMM"
-              }
-            }
-          }
+                year: "YYYY MMM",
+              },
+            },
+          },
         ],
         yAxes: [
           {
             stacked: true,
             ticks: {
-              beginAtZero: true
-            }
-          }
-        ]
+              beginAtZero: true,
+            },
+          },
+        ],
       },
-      maintainAspectRatio: false
-    }
+      maintainAspectRatio: false,
+    },
   });
 });
 

diff --git a/scripts/pi-hole/js/db_lists.js b/scripts/pi-hole/js/db_lists.js
@@ -30,21 +30,21 @@ $(function () {
         Today: [moment().startOf("day"), moment()],
         Yesterday: [
           moment().subtract(1, "days").startOf("day"),
-          moment().subtract(1, "days").endOf("day")
+          moment().subtract(1, "days").endOf("day"),
         ],
         "Last 7 Days": [moment().subtract(6, "days"), moment()],
         "Last 30 Days": [moment().subtract(29, "days"), moment()],
         "This Month": [moment().startOf("month"), moment()],
         "Last Month": [
           moment().subtract(1, "month").startOf("month"),
-          moment().subtract(1, "month").endOf("month")
+          moment().subtract(1, "month").endOf("month"),
         ],
         "This Year": [moment().startOf("year"), moment()],
-        "All Time": [moment(0), moment()]
+        "All Time": [moment(0), moment()],
       },
       opens: "center",
       showDropdowns: true,
-      autoUpdateInput: false
+      autoUpdateInput: false,
     },
     function (startt, endt) {
       from = moment(startt).utc().valueOf() / 1000;

diff --git a/scripts/pi-hole/js/db_queries.js b/scripts/pi-hole/js/db_queries.js
@@ -48,21 +48,21 @@ $(function () {
         Today: [moment().startOf("day"), moment()],
         Yesterday: [
           moment().subtract(1, "days").startOf("day"),
-          moment().subtract(1, "days").endOf("day")
+          moment().subtract(1, "days").endOf("day"),
         ],
         "Last 7 Days": [moment().subtract(6, "days"), moment()],
         "Last 30 Days": [moment().subtract(29, "days"), moment()],
         "This Month": [moment().startOf("month"), moment()],
         "Last Month": [
           moment().subtract(1, "month").startOf("month"),
-          moment().subtract(1, "month").endOf("month")
+          moment().subtract(1, "month").endOf("month"),
         ],
         "This Year": [moment().startOf("year"), moment()],
-        "All Time": [moment(0), moment()]
+        "All Time": [moment(0), moment()],
       },
       opens: "center",
       showDropdowns: true,
-      autoUpdateInput: false
+      autoUpdateInput: false,
     },
     function (startt, endt) {
       from = moment(startt).utc().valueOf() / 1000;
@@ -310,7 +310,7 @@ $(function () {
           x[0] = x[0] * 1e6 + dataIndex++;
           return x;
         });
-      }
+      },
     },
     autoWidth: false,
     processing: true,
@@ -327,26 +327,26 @@ $(function () {
           }
 
           return data;
-        }
+        },
       },
       { width: "10%" },
       { width: "40%", render: $.fn.dataTable.render.text() },
       { width: "20%", type: "ip-address", render: $.fn.dataTable.render.text() },
       { width: "10%" },
-      { width: "5%" }
+      { width: "5%" },
     ],
     lengthMenu: [
       [10, 25, 50, 100, -1],
-      [10, 25, 50, 100, "All"]
+      [10, 25, 50, 100, "All"],
     ],
     columnDefs: [
       {
         targets: -1,
         data: null,
-        defaultContent: ""
-      }
+        defaultContent: "",
+      },
     ],
-    initComplete: reloadCallback
+    initComplete: reloadCallback,
   });
   $("#all-queries tbody").on("click", "button", function () {
     var data = tableApi.row($(this).parents("tr")).data();

diff --git a/scripts/pi-hole/js/debug.js b/scripts/pi-hole/js/debug.js
@@ -20,7 +20,7 @@ function eventsource() {
     $.ajax({
       method: "GET",
       url: "scripts/pi-hole/php/debug.php?IE&token=" + token + "&" + checked,
-      async: false
+      async: false,
     }).done(function (data) {
       ta.show();
       ta.empty();