From 9cd33f531b2f5847cdacceef2c4ef69a091095d8 Mon Sep 17 00:00:00 2001 From: Tangent / Rose / Nebula Rosa Date: Sun, 20 Oct 2024 22:15:51 +0000 Subject: [PATCH] Removed an unnecessary callback, improved readability wip #1 --- background.js | 123 ++++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 65 deletions(-) diff --git a/background.js b/background.js index ee18f22..6ef4548 100644 --- a/background.js +++ b/background.js @@ -1,65 +1,58 @@ -/** - * Randomly shuffle an array - * https://stackoverflow.com/a/2450976/1293256 - * @param {Array} array The array to shuffle - * @return {String} The first item in the shuffled array - */ -var shuffle = function (array) { - - var currentIndex = array.length; - var temporaryValue, randomIndex; - - // While there remain elements to shuffle... - while (0 !== currentIndex) { - // Pick a remaining element... - randomIndex = Math.floor(Math.random() * currentIndex); - currentIndex -= 1; - - // And swap it with the current element. - temporaryValue = array[currentIndex]; - array[currentIndex] = array[randomIndex]; - array[randomIndex] = temporaryValue; - } - - return array; - -}; - -chrome.browserAction.onClicked.addListener(function() { - chrome.tabs.query({}, function(tabs) { - chrome.browserAction.getBadgeText({}, function(text) { - ok = confirm("Are you sure you want to snap " + text + " tabs?") - if (ok) { - shuffle(tabs) - let count = Math.floor(tabs.length / 2) + 1 - tabs = tabs.slice(1, count) - let ids = []; - for (tab in tabs) { - ids.push(tabs[tab].id) - } - chrome.tabs.remove(ids) - } - }) - }) -}) - -function updateCount() { - chrome.tabs.query({}, function(tabs) { - chrome.browserAction.setBadgeText({ text: "" + Math.floor(tabs.length / 2) }) - }) -} - -chrome.tabs.onCreated.addListener(function() { - updateCount() -}) -chrome.tabs.onRemoved.addListener(function() { - updateCount() -}) -chrome.windows.onCreated.addListener(function() { - updateCount() -}) -chrome.windows.onRemoved.addListener(function() { - updateCount() -}) - -updateCount() + +var shuffle = function (array) { + var currentIndex = array.length; + var temporaryValue, randomIndex; + + // While there remain elements to shuffle... + while (0 !== currentIndex) { + + // Pick a remaining element... + randomIndex = Math.floor(Math.random() * currentIndex); + currentIndex -= 1; + + // And swap it with the current element. + temporaryValue = array[currentIndex]; + array[currentIndex] = array[randomIndex]; + array[randomIndex] = temporaryValue; + } + + return array; +}; + +chrome.browserAction.onClicked.addListener(function() { + chrome.tabs.query({}, function(tabs) { + let count = Math.floor(tabs.length / 2) + 1 // I don't remember why we need an extra +1 here, but it is necessary + var ok = confirm("Are you sure you want to close " + count + " tabs?") + if (ok) { + shuffle(tabs) + tabs = tabs.slice(1, count) + let tab_identifiers = []; + for (tab in tabs) { + tab_identifiers.push(tabs[tab].id) + } + chrome.tabs.remove(ids) + } + }) +}) + +function updateCount() { + chrome.tabs.query({}, function(tabs) { + let count = Math.floor(tabs.length / 2) + chrome.browserAction.setBadgeText({ text: "" + count }) + }) +} + +chrome.tabs.onCreated.addListener(function() { + updateCount() +}) +chrome.tabs.onRemoved.addListener(function() { + updateCount() +}) +chrome.windows.onCreated.addListener(function() { + updateCount() +}) +chrome.windows.onRemoved.addListener(function() { + updateCount() +}) + +updateCount()