Changeset 85fa10 for content/vI_statusmenu.js

Timestamp:

Sep 9, 2018, 2:36:02 AM (4 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

c5860f

Parents:

bc6c6b

Message:

removed everything related to smtp-storage

File:

• content/vI_statusmenu.js (modified) (12 diffs)

content/vI_statusmenu.js

@@ -42 +42 @@
 //       objSaveSwitch: null,
 //       objSaveBaseIDSwitch: null,
-//       objSaveSMTPSwitch: null,
 //       objFccSwitch: null,
       objStatusText: null,
@@ -66 +65 @@
 //           statusmenu.objSaveBaseIDSwitch.setAttribute("hidden", !vI.vIprefs.get(data));
 //           break;
-//         case "storage_show_SMTP_switch":
-//           //                 Log.debug("changed storage_show_SMTP_switch to " + statusmenu.objSaveSMTPMenuItem + "=" + vI.vIprefs.get(data));
-//           statusmenu.objSaveSMTPSwitch.setAttribute("hidden", !vI.vIprefs.get(data));
-//           break;
         case "storage_store":
           statusmenu.objStorageSaveMenuItem.setAttribute("checked", vI.vIprefs.get(data));
@@ -75 +70 @@
         case "storage_store_base_id":
           statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", vI.vIprefs.get(data));
-          break;
-        case "storage_store_SMTP":
-          //                 Log.debug("changed storage_store_SMTP to " + statusmenu.objSaveSMTPMenuItem + "=" + vI.vIprefs.get(data));
-          statusmenu.objSaveSMTPMenuItem.setAttribute("checked", vI.vIprefs.get(data));
-          //                 Log.debug("changed storage_store_SMTP done");
           break;
         case "storage_colorIndication":
           document.getElementById("identityHbox").setAttribute("colorize", vI.vIprefs.get(data))
           document.getElementById("baseIDHbox").setAttribute("colorize", vI.vIprefs.get(data))
-//           document.getElementById("smtpServerHbox").setAttribute("colorize", vI.vIprefs.get(data))
           break;
         case "storage":
@@ -90 +79 @@
             statusmenu.objStorageSaveMenuItem.removeAttribute("hidden");
             statusmenu.objSaveBaseIDMenuItem.removeAttribute("hidden");
-//             statusmenu.objSaveSMTPMenuItem.removeAttribute("hidden");
             statusmenu.objStatusMenuSeparator.removeAttribute("hidden");
           } else {
             statusmenu.objStorageSaveMenuItem.setAttribute("hidden", "true");
             statusmenu.objSaveBaseIDMenuItem.setAttribute("hidden", "true");
-//             statusmenu.objSaveSMTPMenuItem.setAttribute("hidden", "true");
             statusmenu.objStatusMenuSeparator.setAttribute("hidden", "true");
           }
@@ -110 +97 @@
 //         vI.vIprefs.addObserver("storage_show_switch", this.observe, this);
 //         vI.vIprefs.addObserver("storage_show_baseID_switch", this.observe, this);
-//         vI.vIprefs.addObserver("storage_show_SMTP_switch", this.observe, this);
         vI.vIprefs.addObserver("storage_colorIndication", this.observe, this);
         vI.vIprefs.addObserver("storage_store", this.observe, this);
         vI.vIprefs.addObserver("storage_store_base_id", this.observe, this);
-//         vI.vIprefs.addObserver("storage_store_SMTP", this.observe, this);
       },
 
@@ -124 +109 @@
 //         vI.vIprefs.removeObserver("storage_show_switch", this.observe);
 //         vI.vIprefs.removeObserver("storage_show_baseID_switch", this.observe);
-//         vI.vIprefs.removeObserver("storage_show_SMTP_switch", this.observe);
         vI.vIprefs.removeObserver("storage_colorIndication", this.observe);
         vI.vIprefs.removeObserver("storage_store", this.observe);
         vI.vIprefs.removeObserver("storage_store_base_id", this.observe);
-//         vI.vIprefs.removeObserver("storage_store_SMTP", this.observe);
       },
 
@@ -135 +118 @@
         statusmenu.objStatusLogo = document.getElementById("virtualIdentityExtension_Logo");
         statusmenu.objSaveBaseIDMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_saveBaseID");
-//         statusmenu.objSaveSMTPMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_saveSMTP");
         statusmenu.objStorageSaveMenuItem = document.getElementById("virtualIdentityExtension_statusMenu_storage_save");
         statusmenu.objStatusMenuSeparator = document.getElementById("virtualIdentityExtension_statusMenu_separator");
 //         statusmenu.objSaveSwitch = document.getElementById("virtualIdentityExtension_saveSwitch");
 //         statusmenu.objSaveBaseIDSwitch = document.getElementById("virtualIdentityExtension_saveBaseIDSwitch");
-//         statusmenu.objSaveSMTPSwitch = document.getElementById("virtualIdentityExtension_SaveSmtpSwitch");
 //         statusmenu.objFccSwitch = document.getElementById("virtualIdentityExtension_fccSwitch");
         statusmenu.objStatusText = document.getElementById("statusText");
@@ -151 +132 @@
 //         statusmenu.observe(this, null, null, "storage_show_switch");
 //         statusmenu.observe(this, null, null, "storage_show_baseID_switch");
-//         statusmenu.observe(this, null, null, "storage_show_SMTP_switch");
         statusmenu.observe(this, null, null, "storage_colorIndication");
         statusmenu.observe(this, null, null, "storage_store_base_id");
-//         statusmenu.observe(this, null, null, "storage_store_SMTP");
         statusmenu.observe(this, null, null, "storage_store");
         statusmenu.observe(this, null, null, "storage");
@@ -160 +139 @@
 
       __timeout: 5, // timeout for status messages in seconds
-      __addStatusMessage: function (save, smtp) {
+      __addStatusMessage: function (save) {
         if (vI.vIprefs.get("show_status")) {
           var sourceString = "vident.statusText.save." + save;
-          if (smtp != "off") sourceString = sourceString + ".smtp"
           var messageLine1 = statusmenu.stringBundle.GetStringFromName(sourceString + ".line1");
           var messageLine2 = statusmenu.stringBundle.GetStringFromName(sourceString + ".line2");
@@ -184 +162 @@
       },
 
-      changeSMTPStatus: function (elem) {
-//         statusmenu.objSaveSMTPMenuItem.setAttribute("checked", elem.getAttribute("checked"));
-        statusmenu.menuConstraint();
-      },
-
       changeBaseIDStatus: function (elem) {
         statusmenu.objSaveBaseIDMenuItem.setAttribute("checked", elem.getAttribute("checked"));
@@ -201 +174 @@
       menuConstraint: function () {
         var save = "off";
-        var smtp = "off";
         if (statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true") {
-//           statusmenu.objSaveSMTPMenuItem.removeAttribute("disabled");
           statusmenu.objSaveBaseIDMenuItem.removeAttribute("disabled");
           if (vI.vIprefs.get("storage")) {
             if (statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true") save = "base";
             else save = "ok";
-//             if (statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true") smtp = "save";
           }
         } else {
-//           statusmenu.objSaveSMTPMenuItem.setAttribute("disabled", "true");
           statusmenu.objSaveBaseIDMenuItem.setAttribute("disabled", "true");
         }
         statusmenu.objStatusMenu.setAttribute("save", save);
-        statusmenu.objStatusMenu.setAttribute("smtp", smtp);
-        statusmenu.__addStatusMessage(save, smtp);
+        statusmenu.__addStatusMessage(save);
       },
 
@@ -224 +192 @@
 
         var curSaveStatus = vI.vIprefs.get("storage_store")
-        var curSaveSMTPStatus = vI.vIprefs.get("storage_store_SMTP")
         var curSaveBaseIDStatus = vI.vIprefs.get("storage_store_base_id")
-        var newSaveStatus = ((!curSaveStatus) || (curSaveStatus && !curSaveSMTPStatus) || (curSaveStatus && !curSaveBaseIDStatus))
-        var newSaveSMTPStatus = ((!curSaveSMTPStatus && curSaveStatus) || (curSaveBaseIDStatus && !curSaveSMTPStatus))
-        var newSaveBaseIDStatus = ((curSaveSMTPStatus && curSaveStatus && !curSaveBaseIDStatus) || (curSaveBaseIDStatus && !curSaveSMTPStatus))
+        var newSaveStatus = ((!curSaveStatus) || (curSaveStatus && !curSaveBaseIDStatus))
+        var newSaveBaseIDStatus = (curSaveStatus && !curSaveBaseIDStatus)
 
         vI.vIprefs.set("storage_store", newSaveStatus)
-        vI.vIprefs.set("storage_store_SMTP", newSaveSMTPStatus)
         vI.vIprefs.set("storage_store_base_id", newSaveBaseIDStatus)