diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 7af68b7..0e92b2f 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -194,6 +194,19 @@ "description": "" }, + "reloadExtension_title": { + "message": "Reload extension", + "description": "" + }, + "reloadExtension_description": { + "message": "Perform a pending update.", + "description": "" + }, + "reloadExtension_label": { + "message": "Reload", + "description": "" + }, + "hideSetting": { "message": "Click here to hide this setting.", "description": "" diff --git a/lib/main.js b/lib/main.js index 602418b..262f1de 100644 --- a/lib/main.js +++ b/lib/main.js @@ -218,6 +218,9 @@ browser.runtime.reload(); }, 1000); } + else { + settings.updatePending = true; + } }); } logging.message("end"); diff --git a/lib/settingDefinitions.js b/lib/settingDefinitions.js index e5a566e..75fa115 100644 --- a/lib/settingDefinitions.js +++ b/lib/settingDefinitions.js @@ -412,6 +412,11 @@ name: "disruptSessionOnUpdate", defaultValue: false }, + { + name: "updatePending", + resetOnStartup: true, + defaultValue: false + }, { name: "isStillDefault", defaultValue: true diff --git a/options/options.js b/options/options.js index b90312b..c55ea3b 100644 --- a/options/options.js +++ b/options/options.js @@ -20,6 +20,9 @@ const mobile = require("../lib/mobile"); const callbacks = { + reloadExtension: function(){ + browser.runtime.reload(); + }, openNavigatorSettings: function(){ logging.verbose("open navigator settings"); window.open("navigator.html", "_blank"); diff --git a/options/settingsDisplay.js b/options/settingsDisplay.js index 38041ee..86c2240 100644 --- a/options/settingsDisplay.js +++ b/options/settingsDisplay.js @@ -19,6 +19,11 @@ { "name": "disruptSessionOnUpdate" }, + { + "name": "reloadExtension", + "actions": ["reloadExtension",], + "displayDependencies": [{"updatePending": [true]}] + }, ] }, { diff --git a/releaseNotes.txt b/releaseNotes.txt index 55be86a..e3ad123 100644 --- a/releaseNotes.txt +++ b/releaseNotes.txt @@ -4,7 +4,7 @@ Version 1.6: new features: - try to not break tabs when updating - - setting to postpone updates until browser restart + - setting to postpone updates until browser restart or extension is reloaded fixes: - fix message canvasBlocker-unload diff --git a/versions/updates.json b/versions/updates.json index c6d8964..1d750d1 100644 --- a/versions/updates.json +++ b/versions/updates.json @@ -169,6 +169,14 @@ { "version": "1.6Alpha20210118", "update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.6Alpha20210118-an+fx.xpi" + }, + { + "version": "1.6Alpha20210126", + "update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.6Alpha20210126-an+fx.xpi" + }, + { + "version": "1.6Alpha20210127", + "update_link": "https://canvasblocker.kkapsner.de/versions/canvasblocker_beta-1.6Alpha20210127-an+fx.xpi" } ] }