Changeset 238a98


Ignore:
Timestamp:
Nov 16, 2011, 12:02:29 AM (9 years ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
308706
Parents:
d8da4b
Message:

transferred some things into modules

Files:
1 added
13 edited
3 moved

Legend:

Unmodified
Added
Removed
  • chrome.manifest

    rd8da4b r238a98  
    1212
    1313overlay chrome://messenger/content/messenger.xul                chrome://v_identity/content/vI_overlay.xul
     14overlay chrome://messenger/content/messenger.xul                chrome://v_identity/content/vI_context.xul
    1415overlay chrome://messenger/content/messenger.xul                chrome://v_identity/content/vI_upgradeOverlay.xul
    15 overlay chrome://messenger/content/messenger.xul                chrome://v_identity/content/vI_context.xul
    1616
    1717overlay chrome://messenger/content/messengercompose/messengercompose.xul    chrome://v_identity/content/v_identity.xul
  • content/modules/plugins/conversation.js

    rd8da4b r238a98  
    33
    44let Log = vI.setupLogging("virtualIdentity.plugin.conversation");
     5
     6Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
     7Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension);
     8Components.utils.import("resource://v_identity/vI_smartIdentityCollection.js", virtualIdentityExtension);
    59
    610const {classes: Cc, interfaces: Ci, utils: Cu, results : Cr} = Components;
     
    114118        }
    115119       
    116         aAddress.params.identity = vI.account._account.defaultIdentity
     120        aAddress.params.identity = vIaccount_defaultIdentity
    117121        if (!vI.finalCheck(currentIdentityData, aAddress.params.identity)) {
    118           vI.account.removeUsedVIAccount();
     122          vIaccount_removeUsedVIAccountt();
    119123          aStatus.canceled = true; return aStatus;
    120124        }
     
    131135 
    132136  onStopSending: function () {
    133     vI.account.removeUsedVIAccount();
     137    vIaccount_removeUsedVIAccount();
    134138    Log.debug("onStopSending done");
    135139  },
  • content/modules/vI_smartIdentityCollection.js

    rd8da4b r238a98  
    2929
    3030let Log = vI.setupLogging("virtualIdentity.smartIdentityCollection");
     31
     32Components.utils.import("resource://v_identity/vI_identityData.js", virtualIdentityExtension);
     33Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
    3134
    3235function smartIdentityCollection(msgHdr, preseletedID, currentIDisVID, newsgroup, recipients) {
  • content/vI_rdfDataEditor.js

    rd8da4b r238a98  
    2525Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js");
    2626virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
     27
     28Components.utils.import("resource://v_identity/vI_identityData.js", virtualIdentityExtension);
     29
    2730var rdfDataEditor = {
    2831    __rdfDatasource : null,
  • content/vI_rdfDataTree.js

    rd8da4b r238a98  
    3333
    3434let Log = vI.setupLogging("virtualIdentity.rdfDataTree");
     35
     36Components.utils.import("resource://v_identity/vI_identityData.js", virtualIdentityExtension);
     37Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
    3538
    3639//prepares an object for easy comparison against another. for strings, lowercases them
  • content/vI_smartIdentity.js

    rd8da4b r238a98  
    2727
    2828let Log = vI.setupLogging("virtualIdentity.smartIdentity");
     29
     30Components.utils.import("resource://v_identity/vI_identityData.js", virtualIdentityExtension);
     31Components.utils.import("resource://v_identity/vI_smartIdentityCollection.js", virtualIdentityExtension);
    2932
    3033var smartIdentity = {
  • content/vI_storage.js

    rd8da4b r238a98  
    3333Components.utils.import("resource://gre/modules/AddonManager.jsm");
    3434let Log = vI.setupLogging("virtualIdentity.storage");
     35Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
    3536
    3637var storage = {
  • content/vI_upgrade.js

    rd8da4b r238a98  
    2727
    2828let Log = vI.setupLogging("virtualIdentity.upgrade");
     29Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
     30Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension);
    2931
    3032var upgrade = {
     
    9294        if (upgrade.rdfDatasource.extUpgradeRequired()) upgrade.extUpgrade();
    9395       
    94         vI.account.cleanupSystem();
     96        vIaccount_cleanupSystem();
    9597    },         
    9698
  • content/vI_upgrade.xul

    rd8da4b r238a98  
    4141
    4242<script type="application/x-javascript" src="chrome://v_identity/content/vI_upgrade.js" />
    43 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_account.js" />
    4443<script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" />
    4544<script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_identityData.js" />
  • content/vI_upgradeOverlay.js

    rd8da4b r238a98  
    2525Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js");
    2626virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
     27 
     28Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
     29Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension);
     30
    2731var upgradeOverlay = {
    2832    init: function() {
     
    3438        }
    3539        else {
    36             vI.account.cleanupSystem(); // always clean leftover accounts and directories
     40            vIaccount_cleanupSystem(); // always clean leftover accounts and directories
    3741            rdfDatasource.storeExtVersion();
    3842        }
  • content/vI_upgradeOverlay.xul

    rd8da4b r238a98  
    3636
    3737<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
    38     <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_account.js" />
    3938    <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_rdfDatasource.js" />
    4039    <script type="application/x-javascript" src="chrome://v_identity/content/vI_upgradeOverlay.js" />
  • content/v_identity.js

    rd8da4b r238a98  
    2727
    2828let Log = vI.setupLogging("virtualIdentity.main");
     29Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension);
    2930
    3031var main = {
     32    prefroot : Components.classes["@mozilla.org/preferences-service;1"]
     33        .getService(Components.interfaces.nsIPrefService)
     34        .getBranch(null),
     35 
    3136    preferences : Components.classes["@mozilla.org/preferences-service;1"]
    3237            .getService(Components.interfaces.nsIPrefService)
     
    119124                if (!server) continue;
    120125                // check for VirtualIdentity Account
    121                 try {   vI.account._prefroot.getBoolPref("mail.account." + accounts[i].key + ".vIdentity");
     126                try {   main.prefroot.getBoolPref("mail.account." + accounts[i].key + ".vIdentity");
    122127                    continue; } catch (e) { };
    123128
     
    146151            var virtualIdentityData = document.getElementById("msgIdentity_clone").identityData;
    147152           
    148             returnValue = vI.prepareSendMsg(    vid, msgType, virtualIdentityData,
     153            returnValue = vIaccount_prepareSendMsg( vid, msgType, virtualIdentityData,
    149154                            main.accountManager.getIdentity(main.elements.Obj_MsgIdentity.value),
    150155                            main._getRecipients() );
     
    165170           
    166171            // final check if eyerything is nice before we handover to the real sending...
    167             if (vI.finalCheck(virtualIdentityData, getCurrentIdentity())) {
     172            if (vIaccount_finalCheck(virtualIdentityData, getCurrentIdentity())) {
    168173                main.replacement_functions.GenericSendMessageInProgress = false;
    169174                main.original_functions.GenericSendMessage(msgType);
     
    349354       
    350355        // set the account name in the choosen menu item
    351         main.tempStorage.NewIdentity.setAttribute("label", vI.account._account.defaultIdentity.identityName);
    352         main.tempStorage.NewIdentity.setAttribute("accountname", " - " +  vI.account._account.incomingServer.prettyName);
    353         main.tempStorage.NewIdentity.setAttribute("accountkey", vI.account._account.key);
    354         main.tempStorage.NewIdentity.setAttribute("value", vI.account._account.defaultIdentity.key);
     356        main.tempStorage.NewIdentity.setAttribute("label", get_vIaccount().defaultIdentity.identityName);
     357        main.tempStorage.NewIdentity.setAttribute("accountname", " - " +  get_vIaccount().incomingServer.prettyName);
     358        main.tempStorage.NewIdentity.setAttribute("accountkey", get_vIaccount().key);
     359        main.tempStorage.NewIdentity.setAttribute("value", get_vIaccount().defaultIdentity.key);
    355360       
    356361        main.elements.Obj_MsgIdentityPopup.appendChild(main.tempStorage.NewIdentity);
     
    371376    prepareAccount : function() {
    372377        main.Cleanup(); // just to be sure that nothing is left (maybe last time sending was irregularily stopped)
    373         vI.account.createAccount(document.getElementById("msgIdentity_clone").identityData,
     378        vIaccount_createAccount(document.getElementById("msgIdentity_clone").identityData,
    374379                                 main.accountManager.getIdentity(main.elements.Obj_MsgIdentity.value));
    375380        main.addVirtualIdentityToMsgIdentityMenu();
     
    378383    Cleanup : function() {
    379384        main.removeVirtualIdentityFromMsgIdentityMenu();
    380         vI.account.removeUsedVIAccount();
     385        vIaccount_removeUsedVIAccount();
    381386    },
    382387   
  • content/v_identity.xul

    rd8da4b r238a98  
    3838
    3939<script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_helper.js" />
    40 <script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_account.js" />
    4140<script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_smartIdentityCollection.js" />
    4241<script type="application/x-javascript" src="chrome://v_identity/content/modules/vI_rdfDatasource.js"/>
  • modules/vI_account.js

    rd8da4b r238a98  
    2323 * ***** END LICENSE BLOCK ***** */
    2424
    25 /* this is now used as a module - there is no required reference to any other interface-elements in this code */
    26 
    27 Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js");
    28 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
    29 
    30 let Log = vI.setupLogging("virtualIdentity.account");
    31 
    32 function prepareSendMsg(vid, msgType, identityData, baseIdentity, recipients) {
     25var EXPORTED_SYMBOLS = ["vIaccount_cleanupSystem", "get_vIaccount",
     26  "vIaccount_prepareSendMsg", "vIaccount_finalCheck",
     27  "vIaccount_createAccount", "vIaccount_removeUsedVIAccount" ]
     28
     29Components.utils.import("resource://v_identity/vI_log.js");
     30Components.utils.import("resource://v_identity/vI_identityData.js");
     31Components.utils.import("resource://v_identity/vI_rdfDatasource.js");
     32
     33let Log = setupLogging("virtualIdentity.account");
     34
     35function vIaccount_prepareSendMsg(vid, msgType, identityData, baseIdentity, recipients) {
    3336    var stringBundle = Services.strings.createBundle("chrome://v_identity/locale/v_identity.properties");
    3437   
     
    5659            return { update : "abort", storedIdentity : null }; // completely abort sending
    5760        }
    58         if (prefs.getBoolPref("storage") &&
    59                 (!vI.statusmenu || vI.statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true")) {
    60             var localeDatasourceAccess = new vI.rdfDatasourceAccess();
     61//      if (prefs.getBoolPref("storage") &&
     62//              (!vI.statusmenu || vI.statusmenu.objStorageSaveMenuItem.getAttribute("checked") == "true")) {
     63        if (prefs.getBoolPref("storage")) {
     64            var localeDatasourceAccess = new rdfDatasourceAccess();
    6165            var returnValue = localeDatasourceAccess.storeVIdentityToAllRecipients(identityData, recipients)
    6266            if ( returnValue.update == "abort" || returnValue.update == "takeover" ) {
     
    6872    }
    6973    if (vid) {
    70         vI.account.removeUsedVIAccount();
    71         vI.account.createAccount(identityData, baseIdentity);
     74        account.removeUsedVIAccount();
     75        account.createAccount(identityData, baseIdentity);
    7276    }
    7377    return { update : "accept", storedIdentity : null };
    7478};
    7579
    76 function finalCheck(virtualIdentityData, currentIdentity) {
     80function vIaccount_finalCheck(virtualIdentityData, currentIdentity) {
    7781    var stringBundle = Services.strings.createBundle("chrome://v_identity/locale/v_identity.properties");
    7882
    79     // vI.identityData(email, fullName, id, smtp, extras, sideDescription, existingID)
    80     var currentIdentityData = new vI.identityData(currentIdentity.email, currentIdentity.fullName, null, currentIdentity.smtpServerKey, null, null, null);
     83    // identityData(email, fullName, id, smtp, extras, sideDescription, existingID)
     84    var currentIdentityData = new identityData(currentIdentity.email, currentIdentity.fullName, null, currentIdentity.smtpServerKey, null, null, null);
    8185   
    8286    Log.debug("\nSendMessage Final Check\n");
     
    435439    }
    436440}
    437 vI.account = account;
    438 vI.prepareSendMsg = prepareSendMsg;
    439 vI.finalCheck = finalCheck;
    440 }});
     441
     442function get_vIaccount() {
     443  return account._account;
     444};
     445vIaccount_cleanupSystem = account.cleanupSystem;
     446vIaccount_createAccount = account.createAccount;
     447vIaccount_removeUsedVIAccount = account.removeUsedVIAccount;
  • modules/vI_identityData.js

    rd8da4b r238a98  
    2323 * ***** END LICENSE BLOCK ***** */
    2424
    25 Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js");
    26 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
    27  
    28 let Log = vI.setupLogging("virtualIdentity.identityData");
     25var EXPORTED_SYMBOLS = ["identityData", "identityCollection", "DEFAULT_SMTP_TAG", "NO_SMTP_TAG"]
     26
     27const DEFAULT_SMTP_TAG = "vI_useDefaultSMTP"
     28const NO_SMTP_TAG = "vI_noStoredSMTP"
     29
     30Components.utils.import("resource://v_identity/vI_log.js");
     31let Log = setupLogging("virtualIdentity.identityData");
    2932
    3033function identityData(email, fullName, id, smtp, extras, sideDescription, existingID) {
     
    3538    this.smtp = new smtpObj(smtp);
    3639    if (extras) this.extras = extras;
    37     else if (typeof(vI.storageExtras)=='function') this.extras = new vI.storageExtras();
     40// else if (typeof(vI.storageExtras)=='function') this.extras = new vI.storageExtras();
    3841    this.comp = {   // holds the results of the last comparison for later creation of a compareMatrix
    3942        compareID : null,
     
    197200    getCompareMatrix : function() {
    198201        const Items = Array("fullName", "email", "smtp", "id");
    199         var string = "";       
    200         var saveBaseId = (!vI.statusmenu && this._pref.getBoolPref("storage_store_base_id")
    201                 || vI.statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true")
    202         var saveSMTP = (!vI.statusmenu && this._pref.getBoolPref("storage_store_SMTP")
    203                 || vI.statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true")
     202        var string = "";
     203        var saveBaseId = this._pref.getBoolPref("storage_store_base_id");
     204        var saveSMTP = this._pref.getBoolPref("storage_store_SMTP");
     205//         var saveBaseId = (!vI.statusmenu && this._pref.getBoolPref("storage_store_base_id")
     206//              || vI.statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true")
     207//      var saveSMTP = (!vI.statusmenu && this._pref.getBoolPref("storage_store_SMTP")
     208//              || vI.statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true")
    204209        for each (let item in Items) {
    205210            var classEqual = (this.comp.equals[item])?"equal":"unequal";
     
    285290    }
    286291};
    287 
    288 const DEFAULT_SMTP_TAG = "vI_useDefaultSMTP"
    289 const NO_SMTP_TAG = "vI_noStoredSMTP"
    290292
    291293function smtpObj(key) {
     
    376378    }
    377379}
    378 vI.DEFAULT_SMTP_TAG = DEFAULT_SMTP_TAG;
    379 vI.NO_SMTP_TAG = NO_SMTP_TAG;
    380 vI.identityCollection = identityCollection;
    381 vI.identityData = identityData;
    382 }});
  • modules/vI_rdfDatasource.js

    rd8da4b r238a98  
    2323 * ***** END LICENSE BLOCK ***** */
    2424
    25 /* this is now used as a module - there is no required reference to any other interface-elements in this code */
    26 
    27 Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js");
    28 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
    29 
    30 let Log = vI.setupLogging("virtualIdentity.rdfDatasource");
     25var EXPORTED_SYMBOLS = ["rdfDatasource", "rdfDatasourceAccess", "rdfDatasourceImporter"]
     26
     27Components.utils.import("resource://v_identity/vI_log.js");
     28let Log = setupLogging("virtualIdentity.rdfDatasource");
     29
     30Components.utils.import("resource://v_identity/vI_identityData.js");
     31Components.utils.import("resource://gre/modules/Services.jsm");
    3132
    3233function rdfDatasource(rdfFileName, dontRegisterObserver) {
     
    224225                resource.QueryInterface(Components.interfaces.nsIRDFResource);
    225226                var smtp = this._getRDFValue(resource, "smtp")
    226                 if (!smtp || smtp == "") this._setRDFValue(resource, "smtp", vI.DEFAULT_SMTP_TAG);
     227                if (!smtp || smtp == "") this._setRDFValue(resource, "smtp", DEFAULT_SMTP_TAG);
    227228                Log.debug(".");
    228229            }
     
    459460                resource.QueryInterface(Components.interfaces.nsIRDFResource);
    460461                var smtp = this._getRDFValue(resource, "smtp")
    461                 if (smtp && smtp != vI.DEFAULT_SMTP_TAG) {
     462                if (smtp && smtp != DEFAULT_SMTP_TAG) {
    462463                    if (!relevantSMTPs[smtp]) relevantSMTPs[smtp] = 1; else relevantSMTPs[smtp] += 1;
    463464                }
     
    592593        this._unsetRDFValue(resource, "name", this._getRDFValue(resource, "name"))
    593594       
    594         var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null;
     595        var extras = null;
     596//         var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null;
    595597        if (extras) extras.loopForRDF(this, resource, "unset");
    596598        this.getContainer(recType).RemoveElement(resource, true);
     
    621623            var id = this._getRDFValue(resource, "id")
    622624            var smtp = this._getRDFValue(resource, "smtp")
    623             if (!smtp) smtp = vI.NO_SMTP_TAG;
    624             var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null;
     625            if (!smtp) smtp = NO_SMTP_TAG;
     626            var extras = null;
     627//          var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null;
    625628           
    626             var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras)
     629            var localIdentityData = new identityData(email, fullName, id, smtp, extras)
    627630            addNewDatum (resource, name, localIdentityData, idData)
    628631        }
     
    637640        else {
    638641            Log.debug("__getDescriptionAndType: '" + recipient + "' is no MailList\n");
    639             var localIdentityData = new vI.identityData(recipient, null, null, null, null, null, null);
     642            var localIdentityData = new identityData(recipient, null, null, null, null, null, null);
    640643            return { recDesc : localIdentityData.combinedName, recType : "email" }
    641644        }
     
    736739        var id = this._getRDFValue(resource, "id")
    737740        var smtp = this._getRDFValue(resource, "smtp")
    738         if (!smtp) smtp = vI.NO_SMTP_TAG;
     741        if (!smtp) smtp = NO_SMTP_TAG;
    739742       
    740743        Log.debug("email='" + email +
    741744            "' fullName='" + fullName + "' id='" + id + "' smtp='" + smtp + "'\n");
    742        
    743         var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null;
    744         var extras_status = (typeof(vI.storageExtras)=='function')?extras.status():" not used";
     745        var extras = null;
     746//      var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this, resource):null;
     747        var extras_status = " not used";
     748//         var extras_status = (typeof(vI.storageExtras)=='function')?extras.status():" not used";
    745749        Log.debug("extras:" + extras_status + "\n");
    746750       
    747         var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras)
     751        var localIdentityData = new identityData(email, fullName, id, smtp, extras)
    748752        return localIdentityData;
    749753    },
     
    759763    updateRDFFromVIdentity : function(identityData, recipientName, recipientType) {
    760764        var recipient = this.__getDescriptionAndType(recipientName, recipientType)
    761         this.updateRDF(recipient.recDesc, recipient.recType, identityData,
    762             (!vI.statusmenu && this._pref.getBoolPref("storage_store_base_id")
    763                 || vI.statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true"),
    764             (!vI.statusmenu && this._pref.getBoolPref("storage_store_SMTP")
    765                 || vI.statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true"),
    766             null, null);
     765        this.updateRDF(recipient.recDesc, recipient.recType, identityData,
     766            this._pref.getBoolPref("storage_store_base_id"),
     767            this._pref.getBoolPref("storage_store_SMTP"),
     768            null, null);
     769//      this.updateRDF(recipient.recDesc, recipient.recType, identityData,
     770//          (!vI.statusmenu && this._pref.getBoolPref("storage_store_base_id")
     771//              || vI.statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true"),
     772//          (!vI.statusmenu && this._pref.getBoolPref("storage_store_SMTP")
     773//              || vI.statusmenu.objSaveSMTPMenuItem.getAttribute("checked") == "true"),
     774//          null, null);
    767775    },
    768776   
     
    800808            this._setRDFValue(resource, "id", localIdentityData.id.key);
    801809        else    this._unsetRDFValue(resource, "id", this._getRDFValue(resource, "id"))
    802         if (storeSMTP && localIdentityData.smtp.key != vI.NO_SMTP_TAG)
     810        if (storeSMTP && localIdentityData.smtp.key != NO_SMTP_TAG)
    803811            this._setRDFValue(resource, "smtp", localIdentityData.smtp.key);
    804812        else    this._unsetRDFValue(resource, "smtp", this._getRDFValue(resource, "smtp"))
     
    874882   
    875883    updateVIdentityFromStorage : function(recipientName, recipientType, currentIdentity, currentIdentityIsVid, isNotFirstInputElement) {
    876         var localIdentities = new vI.identityCollection();
     884        var localIdentities = new identityCollection();
    877885        localIdentities.addWithoutDuplicates(this._rdfDataSource.readVIdentityFromRDF(recipientName, recipientType));
    878886        if (localIdentities.number == 1) Log.debug("using data from direct match\n");
     
    888896                isNotFirstInputElement &&                           // and it is now not the first recipient entered
    889897                !localIdentities.identityDataCollection[0].equalsIdentity(currentIdentity, false).equal) {      // and this id is different than the current used one
    890                     vI.StorageNotification.info(this.stringBundle.GetStringFromName("vident.smartIdentity.vIStorageCollidingIdentity"));
     898                    StorageNotification.info(this.stringBundle.GetStringFromName("vident.smartIdentity.vIStorageCollidingIdentity"));
    891899//                  returnValue.result = "drop";    // this is the default value
    892900            }
     
    11401148                    id = id?relevantIDs[id].id:null
    11411149                    var smtp = this._rdfImportDataSource._getRDFValue(resource, "smtp")
    1142                     smtp = (smtp && smtp != vI.DEFAULT_SMTP_TAG)?relevantSMTPs[smtp].smtp:smtp
    1143                     var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this._rdfImportDataSource, resource):null;
    1144                     var localIdentityData = new vI.identityData(email, fullName, id, smtp, extras)
     1150                    smtp = (smtp && smtp != DEFAULT_SMTP_TAG)?relevantSMTPs[smtp].smtp:smtp
     1151                    var extras = null;
     1152//                     var extras = (typeof(vI.storageExtras)=='function')?new vI.storageExtras(this._rdfImportDataSource, resource):null;
     1153                    var localIdentityData = new identityData(email, fullName, id, smtp, extras)
    11451154                   
    11461155                    this._rdfDataSource.updateRDF(name, treeType, localIdentityData, false, false, null, null)
     
    11711180    }
    11721181}
    1173 vI.rdfDatasource = rdfDatasource;
    1174 vI.rdfDatasourceAccess = rdfDatasourceAccess;
    1175 vI.rdfDatasourceImporter = rdfDatasourceImporter;
    1176 }});
Note: See TracChangeset for help on using the changeset viewer.