Changeset d8c7b8


Ignore:
Timestamp:
Apr 18, 2008, 1:41:42 PM (14 years ago)
Author:
rene <rene@…>
Branches:
master
Children:
b4ccd2
Parents:
59411c
Message:

cleanup, smaller bugfixes

Location:
chrome
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • chrome/content/v_identity/vI_rdfDataEditor.js

    r59411c rd8c7b8  
    7878           
    7979        vI_rdfDataEditor.storageExtras.readEditorValues();
     80       
     81        var localIdentityData = new identityData(address.email, address.name,
     82            document.getElementById("identity_list").selectedItem.getAttribute("value"),
     83            document.getElementById("smtp_server_list").selectedItem.getAttribute("key"),
     84            vI_rdfDataEditor.storageExtras)
     85
    8086        vI_rdfDataEditor.__rdfDatasource.updateRDF(
    8187                document.getElementById("recipient").value,
    8288                document.getElementById("type_menu").selectedItem.getAttribute("key"),
    83                 address.email, address.name,
    84                 document.getElementById("identity_list").selectedItem.getAttribute("value"),
    85                 document.getElementById("smtp_server_list").selectedItem.getAttribute("key"),
    86                 vI_rdfDataEditor.storageExtras
    87                 )
     89                localIdentityData)
    8890    },
    8991}
  • chrome/content/v_identity/vI_rdfDataEditor.xul

    r59411c rd8c7b8  
    3535<script type="application/x-javascript" src="chrome://v_identity/content/vI_rdfDataEditor.js" />
    3636<script type="application/x-javascript" src="chrome://v_identity/content/vI_storageExtras.js" />
     37<script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" />
    3738<script type="application/x-javascript" src="chrome://v_identity/content/vI_helper.js" />
    3839<script type="application/x-javascript" src="chrome://v_identity/content/vI_smtpSelector.js" />
  • chrome/content/v_identity/vI_rdfDataTree.js

    r59411c rd8c7b8  
    5858    __addNewDatum : function(resource, type, name, values) {
    5959        var smtpName = vI_rdfDataTree.__keyTranslator.getSMTPname(values.smtp);
    60         var idName = vI_rdfDataTree.__keyTranslator.getSMTPname(values.id);
     60        var idName = vI_rdfDataTree.__keyTranslator.getIDname(values.id);
    6161       
    6262        var pref = {    recipientCol : name,
  • chrome/content/v_identity/vI_rdfDatasource.js

    r59411c rd8c7b8  
    138138    },
    139139   
     140    // this will be used from rdfDataTree to get all RDF values, callFunction is vI_rdfDataTree.__addNewDatum
    140141    readAllVIdentitiesFromRDF : function (callFunction) {
    141142        vI_notificationBar.dump("## vI_rdfDatasource: readAllVIdentitiesFromRDF.\n");
     
    206207        extras.readValues(); // initialize with current MsgComposeDialog Values
    207208       
    208         vI_rdfDatasource.updateRDF(recDescription, recType, address.email, address.name, id_key, (smtp_key?smtp_key:"default"), extras );
    209     },
    210    
    211     updateRDF : function (recDescription, recType, email, fullName, id, smtp, extras) {
    212         if (!email) {
     209        var localIdentityData = new identityData(address.email, address.name, id, smtp, extras)
     210        vI_rdfDatasource.updateRDF(recDescription, recType, localIdentityData);
     211    },
     212   
     213    updateRDF : function (recDescription, recType, localIdentityData) {
     214        if (!localIdentityData.email) {
    213215            vI_notificationBar.dump("## vI_rdfDatasource: updateRDF: no Sender-email for Recipient, aborting.\n");
    214216            return;
     
    217219        if (!resource) return null;
    218220        vI_notificationBar.dump("## vI_rdfDatasource: updateRDF " + resource.ValueUTF8 + ".\n");
    219         vI_rdfDatasource.__setRDFValue(resource, "email", email)
    220         vI_rdfDatasource.__setRDFValue(resource, "fullName", fullName)
    221         vI_rdfDatasource.__setRDFValue(resource, "id", id)
    222         vI_rdfDatasource.__setRDFValue(resource, "smtp", smtp)
    223        
    224         if (extras) extras.loopForRDF(vI_rdfDatasource.__setRDFValue, resource);
     221        vI_rdfDatasource.__setRDFValue(resource, "email", localIdentityData.email)
     222        vI_rdfDatasource.__setRDFValue(resource, "fullName", localIdentityData.fullName)
     223        vI_rdfDatasource.__setRDFValue(resource, "id", localIdentityData.id)
     224        vI_rdfDatasource.__setRDFValue(resource, "smtp", localIdentityData.smtp)
     225       
     226        if (localIdentityData.extras) localIdentityData.extras.loopForRDF(vI_rdfDatasource.__setRDFValue, resource);
    225227    },
    226228
  • chrome/content/v_identity/vI_storageExtras.js

    r59411c rd8c7b8  
    4444    hideUnusedEditorFields : function() {
    4545        var storageExtras = new vI_storageExtras();
     46        var allHidden = true;
    4647        var hide = (document.getElementById("vI_storageExtras_hideUnusedEditorFields").getAttribute("checked") == "true")
    4748        for( var i = 0; i < storageExtras.extras.length; i++ ) {
    48             document.getElementById("vI_" + storageExtras.extras[i].option).setAttribute("hidden",
    49                 hide && !vI_storageExtrasHelper.preferences.getBoolPref(storageExtras.extras[i].option))
    50             document.getElementById("vI_" + storageExtras.extras[i].option + "_store").setAttribute("hidden",
    51                 hide && !vI_storageExtrasHelper.preferences.getBoolPref(storageExtras.extras[i].option))
    52         }
     49            var hidden = hide && !vI_storageExtrasHelper.preferences.getBoolPref(storageExtras.extras[i].option)
     50            if (!hidden) allHidden = false
     51            document.getElementById("vI_" + storageExtras.extras[i].option).setAttribute("hidden", hidden)
     52            document.getElementById("vI_" + storageExtras.extras[i].option + "_store").setAttribute("hidden", hidden)
     53        }
     54        document.getElementById("storeValue").setAttribute("hidden", allHidden)
    5355        // resize the window to the content
    5456        window.sizeToContent();
  • chrome/content/v_identity/vI_storageExtrasDataEditorOverlay.xul

    r59411c rd8c7b8  
    5151            persist="checked" />
    5252    </caption>
    53         <label value="&vI_storageExtras.storeValue.label;" />
     53        <label id="storeValue" value="&vI_storageExtras.storeValue.label;" />
    5454    <!-- storageExtras_returnReciept -->
    5555        <hbox>
  • chrome/content/v_identity/vI_upgrade.js

    r59411c rd8c7b8  
    137137        //~ alert(splitted.email + "++" + splitted.name + "++" + splitted.combinedName)
    138138       
     139        var localIdentityData = new identityData(splitted.email, splitted.name, id, smtp, null)
     140       
    139141        vI_rdfDatasource.updateRDF(vI_helper.combineNames(Card.displayName, Card.primaryEmail),
    140                         "email", splitted.email, splitted.name, id, smtp, null)
     142                        "email", localIdentityData)
    141143        if (Card.secondEmail.replace(/^\s+|\s+$/g,""))
    142144            vI_rdfDatasource.updateRDF(vI_helper.combineNames(Card.displayName, Card.secondEmail),
    143                     "email", splitted.email, splitted.name, id, smtp, null)
     145                    "email", localIdentityData)
    144146       
    145147        Card[returnVar.prop] = "";
  • chrome/content/v_identity/vI_upgrade.xul

    r59411c rd8c7b8  
    2727<?xml-stylesheet href="chrome://v_identity/skin/v_identity.css" type="text/css"?>
    2828
    29 <!DOCTYPE page [
    30 <!ENTITY % vIdentUpgradeDTD SYSTEM "chrome://v_identity/locale/vI_upgrade.dtd">
    31 %vIdentUpgradeDTD;
     29<!DOCTYPE overlay [
    3230<!ENTITY % versionDTD SYSTEM "chrome://v_identity/content/_version.dtd">
    3331%versionDTD;
    3432<!ENTITY % vIdentDTD SYSTEM "chrome://v_identity/locale/v_identity.dtd">
    3533%vIdentDTD;
     34<!ENTITY % upgradeDTD SYSTEM "chrome://v_identity/locale/vI_upgrade.dtd">
     35%upgradeDTD;
    3636]>
    3737
     
    118118    <button class="v_identity_logo v_identity_logo_button"
    119119        label="&vident.vidLogo.label; &vident.version;"
    120         oncommand="vI_upgrade.openURL('http://www.absorb.it/virtual-id')" tooltiptext="&vident.prefs.vidLogo.tooltiptext;" />
     120        oncommand="vI_upgrade.openURL('http://www.absorb.it/virtual-id')" tooltiptext="&vident.upgrade.vidLogo.tooltiptext;" />
    121121    <spacer width="10px" />
    122122    <label id="extVersion" value="&vident.version;" hidden="true" />
  • chrome/locale/en-US/v_identity/vI_upgrade.dtd

    r59411c rd8c7b8  
    1717<!ENTITY vident.upgrade.finish.description "finish">
    1818<!ENTITY vident.upgrade.finish.caption "Virtual Identity">
     19<!ENTITY vident.upgrade.vidLogo.tooltiptext "Open Virtual Identity Homepage">
Note: See TracChangeset for help on using the changeset viewer.