Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump xo from 0.59.3 to 0.60.0 #3181

Merged
merged 3 commits into from
Dec 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 68 additions & 56 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"postcss": "^8.4.49",
"postcss-cli": "^11.0.0",
"prettier": "^3.4.2",
"xo": "^0.59.3"
"xo": "^0.60.0"
},
"browserslist": [
"defaults",
Expand Down
4 changes: 2 additions & 2 deletions scripts/js/charts.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ const htmlLegendPlugin = {

textLink.addEventListener("click", () => {
if (chart.canvas.id === "queryTypePieChart") {
window.location.href = "queries.lp?type=" + item.text;
globalThis.location.href = "queries.lp?type=" + item.text;
} else if (chart.canvas.id === "forwardDestinationPieChart") {
// Encode the forward destination as it may contain an "#" character
const upstream = encodeURIComponent(upstreams[item.text]);
window.location.href = "queries.lp?upstream=" + upstream;
globalThis.location.href = "queries.lp?upstream=" + upstream;
}
});
}
Expand Down
10 changes: 5 additions & 5 deletions scripts/js/footer.js
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ function updateSystemInfo() {
function apiFailure(data) {
if (data.status === 401) {
// Unauthorized, reload page
window.location.reload();
globalThis.location.reload();
}
}

Expand Down Expand Up @@ -596,7 +596,7 @@ function updateVersionInfo() {
}

$(function () {
if (window.location.pathname !== "/admin/login") updateInfo();
if (globalThis.location.pathname !== "/admin/login") updateInfo();
var enaT = $("#enableTimer");
var target = new Date(parseInt(enaT.html(), 10));
var seconds = Math.round((target.getTime() - Date.now()) / 1000);
Expand All @@ -611,7 +611,7 @@ $(function () {
// Apply per-browser styling settings
initCheckboxRadioStyle();

if (window.location.pathname !== "/admin/login") {
if (globalThis.location.pathname !== "/admin/login") {
// Run check immediately after page loading ...
utils.checkMessages();
// ... and then periodically
Expand Down Expand Up @@ -705,7 +705,7 @@ function applyExpertSettings() {
// functionality there), and
// - there are no visible boxes (the page is empty)
if ($(".settings-selector").length > 0 && $(".box:visible").length === 0) {
window.location.href = "/admin/settings/system";
globalThis.location.href = "/admin/settings/system";
}
}
}
Expand All @@ -715,7 +715,7 @@ function addAdvancedInfo() {
const advancedInfoTarget = $("#advanced-info");
const isTLS = advancedInfoSource.data("tls");
const clientIP = advancedInfoSource.data("client-ip");
const XForwardedFor = window.atob(advancedInfoSource.data("xff") ?? "");
const XForwardedFor = globalThis.atob(advancedInfoSource.data("xff") ?? "");
const starttime = parseFloat(advancedInfoSource.data("starttime"));
const endtime = parseFloat(advancedInfoSource.data("endtime"));
const totaltime = 1e3 * (endtime - starttime);
Expand Down
2 changes: 1 addition & 1 deletion scripts/js/gravity.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ $(function () {

// Do we want to start updating immediately?
// gravity.lp?go
var searchString = window.location.search.substring(1);
var searchString = globalThis.location.search.substring(1);
if (searchString.indexOf("go") !== -1) {
$("#gravityBtn").prop("disabled", true);
eventsource();
Expand Down
2 changes: 1 addition & 1 deletion scripts/js/groups-clients.js
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ function initTable() {
selectEl
// fix dropdown if it would stick out right of the viewport
.on("show.bs.select", function () {
var winWidth = $(window).width();
var winWidth = $(globalThis).width();
var dropdownEl = $("body > .bootstrap-select.dropdown");
if (dropdownEl.length > 0) {
dropdownEl.removeClass("align-right");
Expand Down
2 changes: 1 addition & 1 deletion scripts/js/groups-domains.js
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ function initTable() {
selectEl
// fix dropdown if it would stick out right of the viewport
.on("show.bs.select", function () {
var winWidth = $(window).width();
var winWidth = $(globalThis).width();
var dropdownEl = $("body > .bootstrap-select.dropdown");
if (dropdownEl.length > 0) {
dropdownEl.removeClass("align-right");
Expand Down
2 changes: 1 addition & 1 deletion scripts/js/groups-lists.js
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ function initTable() {
selectEl
// fix dropdown if it would stick out right of the viewport
.on("show.bs.select", function () {
var winWidth = $(window).width();
var winWidth = $(globalThis).width();
var dropdownEl = $("body > .bootstrap-select.dropdown");
if (dropdownEl.length > 0) {
dropdownEl.removeClass("align-right");
Expand Down
4 changes: 2 additions & 2 deletions scripts/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ $(function () {
//get value by index
var from = label / 1000 - 300;
var until = label / 1000 + 300;
window.location.href = "queries.lp?from=" + from + "&until=" + until;
globalThis.location.href = "queries.lp?from=" + from + "&until=" + until;
}

return false;
Expand All @@ -813,7 +813,7 @@ $(function () {
//get value by index
var from = label / 1000 - 300;
var until = label / 1000 + 300;
window.location.href = "queries.lp?from=" + from + "&until=" + until;
globalThis.location.href = "queries.lp?from=" + from + "&until=" + until;
}

return false;
Expand Down
10 changes: 4 additions & 6 deletions scripts/js/interfaces.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,10 @@ $(function () {

if (addr.address_type !== undefined) {
let familyextra = "";
if (addr.family !== undefined) {
if (addr.family === "inet") {
familyextra = "IPv4 ";
} else if (addr.family === "inet6") {
familyextra = "IPv6 ";
}
if (addr.family === "inet") {
familyextra = "IPv4 ";
} else if (addr.family === "inet6") {
familyextra = "IPv6 ";
}

extraaddr += " (" + familyextra + utils.escapeHtml(addr.address_type) + ")";
Expand Down
Loading
Loading