Remove old minimizeOnClose

webext/background.js

@@ -87,10 +87,12 @@ SysTrayX.Messaging = {
       browser.folderChange.setFilters(SysTrayX.Messaging.filters);
     }
 
-    if ("minimizeOnClose" in changes && changes["minimizeOnClose"].newValue) {
-      const minimizeOnClose = changes["minimizeOnClose"].newValue;
+    if ("closeType" in changes && changes["closeType"].newValue) {
+      SysTrayX.Messaging.closeType = changes["closeType"].newValue;
 
-      if (minimizeOnClose === "true") {
+      browser.windowEvent.setCloseType(Number(SysTrayX.Messaging.closeType));
+
+      if (SysTrayX.Messaging.closeType !== "0") {
         browser.windowEvent.onCloseButtonClick.addListener(
           SysTrayX.Messaging.onCloseButton
         );
@@ -101,12 +103,6 @@ SysTrayX.Messaging = {
       }
     }
 
-    if ("closeType" in changes && changes["closeType"].newValue) {
-      SysTrayX.Messaging.closeType = changes["closeType"].newValue;
-
-      browser.windowEvent.setCloseType(Number(SysTrayX.Messaging.closeType));
-    }
-
     if ("countType" in changes && changes["countType"].newValue) {
       SysTrayX.Messaging.countType = changes["countType"].newValue;
 
@@ -164,7 +160,6 @@ SysTrayX.Messaging = {
       "minimizeType",
       "closeType",
       "startMinimized",
-      "minimizeOnClose",
       "defaultIconType",
       "defaultIconMime",
       "defaultIcon",
@@ -185,7 +180,6 @@ SysTrayX.Messaging = {
     const minimizeType = result.minimizeType || "1";
     const closeType = result.closeType || "1";
     const startMinimized = result.startMinimized || "false";
-    const minimizeOnClose = result.minimizeOnClose || "true";
     const defaultIconType = result.defaultIconType || "0";
     const defaultIconMime = result.defaultIconMime || "image/png";
     const defaultIcon = result.defaultIcon || [];
@@ -205,7 +199,6 @@ SysTrayX.Messaging = {
         minimizeType: minimizeType,
         closeType: closeType,
         startMinimized: startMinimized,
-        minimizeOnClose: minimizeOnClose,
         defaultIconType: defaultIconType,
         defaultIconMime: defaultIconMime,
         defaultIcon: defaultIcon,
@@ -393,13 +386,6 @@ SysTrayX.Link = {
         });
       }
 
-      const minimizeOnClose = response["preferences"].minimizeOnClose;
-      if (minimizeOnClose) {
-        browser.storage.sync.set({
-          minimizeOnClose: minimizeOnClose,
-        });
-      }
-
       const debug = response["preferences"].debug;
       if (debug) {
         browser.storage.sync.set({
@@ -436,11 +422,8 @@ async function start() {
   SysTrayX.Messaging.closeType = await getCloseType();
   browser.windowEvent.setCloseType(Number(SysTrayX.Messaging.closeType));
 
-  //  Get the minimize on close preference
-  const minimizeOnClose = await getMinimizeOnClose();
-
   //  Intercept close button?
-  if (minimizeOnClose) {
+  if (SysTrayX.Messaging.closeType !== "0") {
     browser.windowEvent.onCloseButtonClick.addListener(
       SysTrayX.Messaging.onCloseButton
     );

webext/js/defaults.js

@@ -126,26 +126,6 @@ async function getStartupState() {
   return await getState.then(getStartupState, onStartupStateError);
 }
 
-//
-//  Get minimize on close state
-//
-async function getMinimizeOnClose() {
-  function getMinimizeOnClosePref(result) {
-    const minimizeOnClose = result.minimizeOnClose || "true";
-    return minimizeOnClose === "true";
-  }
-
-  function onMinimizeOnClosePrefError() {
-    return true;
-  }
-
-  const getState = browser.storage.sync.get("minimizeOnClose");
-  return await getState.then(
-    getMinimizeOnClosePref,
-    onMinimizeOnClosePrefError
-  );
-}
-
 //
 //  Get KDE integration, default icon hide
 //

webext/options.html

@@ -91,9 +91,6 @@
 
         <input type="checkbox" name="startMinimized" value="" /> Start
         application minimized<br />
-
-        <input type="checkbox" name="minimizeOnClose" value="" /> Minimize on
-        close<br />
       </form>
     </div>
 

webext/options.js

@@ -86,16 +86,6 @@ SysTrayX.SaveOptions = {
       startMinimized: `${startMinimized}`,
     });
 
-    //
-    //  Save minimize on close state
-    //
-    let minimizeOnClose = document.querySelector(
-      'input[name="minimizeOnClose"]'
-    ).checked;
-    browser.storage.sync.set({
-      minimizeOnClose: `${minimizeOnClose}`,
-    });
-
     //
     // Save default icon preferences
     //
@@ -234,15 +224,6 @@ SysTrayX.RestoreOptions = {
       SysTrayX.RestoreOptions.onStartMinimizedError
     );
 
-    //
-    //  Restore minimize on close
-    //
-    const getMinimizeOnClose = browser.storage.sync.get("minimizeOnClose");
-    getMinimizeOnClose.then(
-      SysTrayX.RestoreOptions.setMinimizeOnClose,
-      SysTrayX.RestoreOptions.onMinimizeOnCloseError
-    );
-
     //
     //  Restore default icon type
     //
@@ -414,20 +395,6 @@ SysTrayX.RestoreOptions = {
     console.log(`startMinimized Error: ${error}`);
   },
 
-  //
-  //  Restore minimize on close callbacks
-  //
-  setMinimizeOnClose: function (result) {
-    const minimizeOnClose = result.minimizeOnClose || "true";
-
-    const checkbox = document.querySelector(`input[name="minimizeOnClose"]`);
-    checkbox.checked = minimizeOnClose === "true";
-  },
-
-  onMinimizeOnCloseError: function (error) {
-    console.log(`minimizeOnClose Error: ${error}`);
-  },
-
   //
   //  Restore icon type callbacks
   //
@@ -795,11 +762,6 @@ SysTrayX.StorageChanged = {
           startMinimized: changes[item].newValue,
         });
       }
-      if (item === "minimizeOnClose") {
-        SysTrayX.RestoreOptions.setMinimizeOnClose({
-          minimizeOnClose: changes[item].newValue,
-        });
-      }
       if (item === "debug") {
         SysTrayX.RestoreOptions.setDebug({
           debug: changes[item].newValue,