Changeset c3feaa for chrome/content/v_identity/vI_storageExtras.js

Timestamp:

Aug 16, 2011, 10:12:23 PM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.8, ng_0.9

Children:

190674

Parents:

92fd25

Message:

clean namespace from pollution

File:

• chrome/content/v_identity/vI_storageExtras.js (modified) (20 diffs)

chrome/content/v_identity/vI_storageExtras.js

@@ -22 +22 @@
  * ***** END LICENSE BLOCK ***** */
 
-function vI_storageExtras_adapt(sourceId, targetId) {
+virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+function storageExtras_adapt(sourceId, targetId) {
     var checked = document.getElementById(sourceId).getAttribute("checked");
     if (targetId) var target = document.getElementById(targetId)
@@ -30 +31 @@
 }   
 
-var vI_storageExtrasHelper = {
+var storageExtrasHelper = {
     seamonkey_old : null,
 
@@ -38 +39 @@
     
     hideUnusedEditorFields : function() {
-        var storageExtras = new vI_storageExtras();
+        var localStorageExtras = new storageExtras();
         var allHidden = true;
         var hide = (document.getElementById("vI_storageExtras_hideUnusedEditorFields").getAttribute("checked") == "true")
-        for( var i = 0; i < storageExtras.extras.length; i++ ) {
-            var hidden = hide && !vI_storageExtrasHelper.preferences.getBoolPref(storageExtras.extras[i].option)
+        for( var i = 0; i < localStorageExtras.extras.length; i++ ) {
+            var hidden = hide && !storageExtrasHelper.preferences.getBoolPref(localStorageExtras.extras[i].option)
             if (!hidden) allHidden = false
-            document.getElementById("vI_" + storageExtras.extras[i].option).setAttribute("hidden", hidden)
-            document.getElementById("vI_" + storageExtras.extras[i].option + "_store").setAttribute("hidden", hidden)
+            document.getElementById("vI_" + localStorageExtras.extras[i].option).setAttribute("hidden", hidden)
+            document.getElementById("vI_" + localStorageExtras.extras[i].option + "_store").setAttribute("hidden", hidden)
         }
         document.getElementById("storeValue").setAttribute("hidden", allHidden)
@@ -53 +54 @@
 }
 
-function vI_storageExtras(rdfDatasource, resource) {
-// function vI_storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
+function storageExtras(rdfDatasource, resource) {
+// function storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
     this.extras = [
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "reciept", "storageExtras_returnReciept", "returnReceiptMenu", null, function(identity) { return identity.requestReturnReceipt; }),
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "fcc", "storageExtras_fcc", "fcc_switch", null, function(identity) { return identity.doFcc; }),
-        new vI_storageExtras_characterEncoding(),
-        new vI_storageExtras_msgFormat(),
-        new vI_storageExtras_checkbox(
+        new storageExtras_characterEncoding(),
+        new storageExtras_msgFormat(),
+        new storageExtras_checkbox(
             "sMimeEnc", "storageExtras_sMime_messageEncryption", "menu_securityEncryptRequire1",
                 function() { return ((typeof(setSecuritySettings)=='function')?setSecuritySettings(1):null) },
                 function(identity) { return (identity.getIntAttribute('encryptionpolicy') == 2) }),
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "sMimeSig", "storageExtras_sMime_messageSignature", "menu_securitySign1",
                 function() { return ((typeof(setSecuritySettings)=='function')?setSecuritySettings(1):null) },
                 function(identity) { return (identity.getBoolAttribute('sign_mail')) }),
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "PGPEnc", "storageExtras_openPGP_messageEncryption", "enigmail_encrypted_send",
                 function() { return ((typeof(enigSetMenuSettings)=='function')?enigSetMenuSettings(''):null) },
                 function(identity) { return (identity.getIntAttribute('defaultEncryptionPolicy') > 0) }),
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "PGPSig", "storageExtras_openPGP_messageSignature", "enigmail_signed_send",
                 function() { return ((typeof(enigSetMenuSettings)=='function')?enigSetMenuSettings(''):null) },
                 function(identity) { return ((identity.getIntAttribute('defaultEncryptionPolicy') > 0)?identity.getBoolAttribute('pgpSignEncrypted'):identity.getBoolAttribute('pgpSignPlain')) }),
-        new vI_storageExtras_checkbox(
+        new storageExtras_checkbox(
             "PGPMIME", "storageExtras_openPGP_PGPMIME", "enigmail_sendPGPMime",
                 function() { return ((typeof(enigSetMenuSettings)=='function')?enigSetMenuSettings(''):null) },
@@ -86 +87 @@
 }
 
-vI_storageExtras.prototype = {
+storageExtras.prototype = {
     loopForRDF : function(rdfDatasource, resource, type) {
         for( var i = 0; i < this.extras.length; i++ ) {
-//          if (vI_notificationBar) vI_notificationBar.dump("## vI_rdfDatasource: loopForRDF " + rdfDatasource + "\n");
+//          if (vI.notificationBar) vI.notificationBar.dump("## vI.rdfDatasource: loopForRDF " + rdfDatasource + "\n");
             // only if pref set and feature(element available) or for dataEditor
             if (typeof(gMsgCompose) == "undefined" || !gMsgCompose || this.extras[i].active) {
@@ -103 +104 @@
     // just give a duplicate of the current storageExtras, else we will work with pointers
     getDuplicate : function() {
-        var newExtras = new vI_storageExtras();
+        var newExtras = new storageExtras();
         for( var i = 0; i < this.extras.length; i++ ) {
             newExtras.extras[i].value = this.extras[i].value;
@@ -166 +167 @@
         for( var i = 0; i < this.extras.length; i++ ) {
             if (this.extras[i].active) this.extras[i].readIdentityValue(identity)
-//          vI_notificationBar.dump("## vI_storageExtras readIdentityValues "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
+//          vI.notificationBar.dump("## storageExtras readIdentityValues "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
         }
     },
@@ -173 +174 @@
         for( var i = 0; i < this.extras.length; i++ ) {
             if (this.extras[i].active) this.extras[i].setValue()
-//          vI_notificationBar.dump("## vI_storageExtras setValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
+//          vI.notificationBar.dump("## storageExtras setValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
         }
     },
     readValues : function() {
         for( var i = 0; i < this.extras.length; i++ ) {
-//          vI_notificationBar.dump("## vI_storageExtras preparing readValue "+ this.extras[i].field +"\n");
+//          vI.notificationBar.dump("## storageExtras preparing readValue "+ this.extras[i].field +"\n");
             if (this.extras[i].active) this.extras[i].readValue()
-//              vI_notificationBar.dump("## vI_storageExtras readValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
+//              vI.notificationBar.dump("## storageExtras readValue "+ this.extras[i].field + "=" + this.extras[i].value + "\n");
         }
     },
@@ -189 +190 @@
         for( var i = 0; i < this.extras.length; i++ ) {
             this.extras[i].readEditorValue();
-//          vI_notificationBar.dump("## vI_storageExtras readValue " + this.extras[i].field + "=" + this.extras[i].value + "\n");
-        }
-    },
-
-    // add value's to the pref object, required for rdfDataTree
+//          vI.notificationBar.dump("## storageExtras readValue " + this.extras[i].field + "=" + this.extras[i].value + "\n");
+        }
+    },
+
+    // add value's to the pref object, required for rdfDataTreeCollection
     addPrefs : function(pref) {
         for( var i = 0; i < this.extras.length; i++ )
@@ -200 +201 @@
 }
 
-function vI_storageExtras_characterEncoding_setMenuMark() {
+function storageExtras_characterEncoding_setMenuMark() {
     var maileditCharsetMenu = document.getElementById("maileditCharsetMenu")
     var value = maileditCharsetMenu.getAttribute("unmarkedValue")
@@ -209 +210 @@
     }
 }
-function vI_storageExtras_characterEncoding() {
-    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
-                vI_storageExtrasHelper.preferences.getBoolPref(this.option)
+function storageExtras_characterEncoding() {
+    this.active = storageExtrasHelper.preferences.getBoolPref("storage") &&
+                storageExtrasHelper.preferences.getBoolPref(this.option)
     this.comp = { compareValue : null, equal : null }
 }
-vI_storageExtras_characterEncoding.prototype = {
+storageExtras_characterEncoding.prototype = {
     active : null,
     value : null,
@@ -246 +247 @@
             var onpopupshowing = maileditCharsetMenu.getAttribute("onpopupshowing")
             document.getElementById("maileditCharsetMenu").setAttribute("onpopupshowing",
-                onpopupshowing + ";vI_storageExtras_characterEncoding_setMenuMark();")
+                onpopupshowing + ";storageExtras_characterEncoding_setMenuMark();")
         }
         gMsgCompose.compFields.characterSet = this.value;
@@ -254 +255 @@
         // read the value from the internal vI object, global object might not be available any more
         // happens especially while storing after sending the message
-        this.value = vI_main.gMsgCompose.compFields.characterSet;
+        this.value = vI.main.gMsgCompose.compFields.characterSet;
         if (gCharsetConvertManager) {
             var charsetAlias = gCharsetConvertManager.getCharsetAlias(this.value);
@@ -281 +282 @@
 }
 
-function vI_storageExtras_msgFormat() {
-    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
-                vI_storageExtrasHelper.preferences.getBoolPref(this.option)
+function storageExtras_msgFormat() {
+    this.active = storageExtrasHelper.preferences.getBoolPref("storage") &&
+                storageExtrasHelper.preferences.getBoolPref(this.option)
     this.comp = { value : null, compareValue : null, equal : null }
 }
-vI_storageExtras_msgFormat.prototype = {
+storageExtras_msgFormat.prototype = {
     active : null,
     value : null,
@@ -338 +339 @@
 }
 
-function vI_storageExtras_sMime_messageEncryption() { 
-    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
-                vI_storageExtrasHelper.preferences.getBoolPref(this.option)
+function storageExtras_sMime_messageEncryption() { 
+    this.active = storageExtrasHelper.preferences.getBoolPref("storage") &&
+                storageExtrasHelper.preferences.getBoolPref(this.option)
     this.comp = { value : null, compareValue : null, equal : null }
 }
-vI_storageExtras_sMime_messageEncryption.prototype = {
+storageExtras_sMime_messageEncryption.prototype = {
     active : null,
     value : null,
@@ -375 +376 @@
     // function to set or read the value from/to the MessageCompose Dialog
     setValue : function() {
-        vI_notificationBar.dump("## storageExtras_sMime_messageEncryption \n");
+        vI.notificationBar.dump("## storageExtras_sMime_messageEncryption \n");
         var doEncryptElem = document.getElementById("menu_securityEncryptRequire1");
         if (this.value == null) return;
@@ -405 +406 @@
 
 // a general checkbox for extra options. Has to provide some additional information
-function vI_storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
+function storageExtras_checkbox(field, option, composeDialogElementID, updateFunction, identityValue) {
     this.field = field;     // description of the option
     this.option = option;       // option string to get preference settings
@@ -411 +412 @@
     this.updateFunction = updateFunction;
     this.valueFromIdentityFunction = identityValue;
-    this.active = vI_storageExtrasHelper.preferences.getBoolPref("storage") &&
-                vI_storageExtrasHelper.preferences.getBoolPref(this.option) 
+    this.active = storageExtrasHelper.preferences.getBoolPref("storage") &&
+                storageExtrasHelper.preferences.getBoolPref(this.option) 
 //      elements are never available in DataTree, so leave this out.
 //      && document.getElementById(this.composeDialogElementID);
     this.comp = { compareValue : null, equal : null }
 }
-vI_storageExtras_checkbox.prototype = {
+storageExtras_checkbox.prototype = {
     active : null,
     value : null,
@@ -457 +458 @@
 
         if ((element.getAttribute("checked") == "true") != (this.value == "true")) {
-            vI_notificationBar.dump("## vI_storageExtras change "+ this.field + " to " + this.value + " with doCommand\n");
+            vI.notificationBar.dump("## storageExtras change "+ this.field + " to " + this.value + " with doCommand\n");
             element.doCommand();
         }
@@ -483 +484 @@
     }
 }
+
+vI.storageExtras = storageExtras;
+vI.storageExtrasHelper = storageExtrasHelper;
+vI.storageExtras_adapt = storageExtras_adapt;
+}});