From ade6828348d30016f480a881ec79ff3bfd34aeaf Mon Sep 17 00:00:00 2001 From: William Budington Date: Thu, 7 Mar 2019 15:39:31 -0800 Subject: [PATCH 1/2] Display the version even for rulesets that are bundled with the extension to avoid confusion --- chromium/background-scripts/update.js | 2 +- chromium/pages/popup/ux.js | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/chromium/background-scripts/update.js b/chromium/background-scripts/update.js index 011b8f0a9d5e..bdc1cc56baa5 100644 --- a/chromium/background-scripts/update.js +++ b/chromium/background-scripts/update.js @@ -109,7 +109,7 @@ async function getRulesetTimestamps() { for(let update_channel of combined_update_channels) { timestamp_promises.push(new Promise(async resolve => { let timestamp = await store.local.get_promise('rulesets-stored-timestamp: ' + update_channel.name, 0); - resolve([update_channel.name, timestamp]); + resolve([update_channel, timestamp]); })); } let timestamps = await Promise.all(timestamp_promises); diff --git a/chromium/pages/popup/ux.js b/chromium/pages/popup/ux.js index efc09aafdd26..fccb3efc77e6 100644 --- a/chromium/pages/popup/ux.js +++ b/chromium/pages/popup/ux.js @@ -194,16 +194,30 @@ document.addEventListener("DOMContentLoaded", function () { version_info.innerText = the_manifest.version; let rulesets_versions = e('rulesets-versions'); + + rulesets_versions.addSpan = function(update_channel_name, ruleset_version_string) { + let timestamp_span = document.createElement("span"); + timestamp_span.className = "rulesets-version"; + timestamp_span.innerText = chrome.i18n.getMessage("about_rulesets_version") + " " + update_channel_name + ": " + ruleset_version_string; + this.appendChild(timestamp_span); + } + sendMessage("get_ruleset_timestamps", null, timestamps => { + let replace = timestamps.reduce((reduced, [update_channel, timestamp]) => { + if(update_channel.replaces_default_rulesets && timestamp > 0) { + return true; + } + return false; + }, false); + if(!replace) { + rulesets_versions.addSpan("EFF (Full, Bundled)", the_manifest.version); + } for(let [update_channel, timestamp] of timestamps) { if(timestamp > 0) { let ruleset_date = new Date(timestamp * 1000); let ruleset_version_string = ruleset_date.getUTCFullYear() + "." + (ruleset_date.getUTCMonth() + 1) + "." + ruleset_date.getUTCDate(); - let timestamp_span = document.createElement("span"); - timestamp_span.className = "rulesets-version"; - timestamp_span.innerText = chrome.i18n.getMessage("about_rulesets_version") + " " + update_channel + ": " + ruleset_version_string; - rulesets_versions.appendChild(timestamp_span); + rulesets_versions.addSpan(update_channel.name, ruleset_version_string); } } }); From 8f20382da18e6a90f5b96573c2234efbe1a57bf9 Mon Sep 17 00:00:00 2001 From: William Budington Date: Sun, 10 Mar 2019 19:50:11 -0700 Subject: [PATCH 2/2] fixup --- chromium/pages/popup/ux.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/chromium/pages/popup/ux.js b/chromium/pages/popup/ux.js index fccb3efc77e6..26a6a45a2c81 100644 --- a/chromium/pages/popup/ux.js +++ b/chromium/pages/popup/ux.js @@ -198,18 +198,15 @@ document.addEventListener("DOMContentLoaded", function () { rulesets_versions.addSpan = function(update_channel_name, ruleset_version_string) { let timestamp_span = document.createElement("span"); timestamp_span.className = "rulesets-version"; - timestamp_span.innerText = chrome.i18n.getMessage("about_rulesets_version") + " " + update_channel_name + ": " + ruleset_version_string; + timestamp_span.innerText = `${chrome.i18n.getMessage("about_rulesets_version")} ${update_channel_name}: ${ruleset_version_string}`; this.appendChild(timestamp_span); } sendMessage("get_ruleset_timestamps", null, timestamps => { - let replace = timestamps.reduce((reduced, [update_channel, timestamp]) => { - if(update_channel.replaces_default_rulesets && timestamp > 0) { - return true; - } - return false; - }, false); - if(!replace) { + let replaces = timestamps.some(([update_channel, timestamp]) => + update_channel.replaces_default_rulesets && timestamp > 0 + ); + if(!replaces) { rulesets_versions.addSpan("EFF (Full, Bundled)", the_manifest.version); } for(let [update_channel, timestamp] of timestamps) {