Changeset 16f697

Timestamp:

Sep 2, 2008, 5:28:39 PM (12 years ago)

Author:

rene <rene@…>

Branches:

master

Children:

86c311

Parents:

f382e7

Message:

while storing, if base-id's are different and not to be saved, remove previously stored base-id

Location:

chrome

Files:

• content/v_identity/vI_rdfDataEditor.js (modified) (1 diff)
• content/v_identity/vI_rdfDatasource.js (modified) (1 diff)
• content/v_identity/vI_storage.js (modified) (1 diff)
• content/v_identity/vI_upgrade.js (modified) (1 diff)
• skin/classic/v_identity/vI_DialogBrowser.css (modified) (1 diff)

chrome/content/v_identity/vI_rdfDataEditor.js

@@ -86 +86 @@
     accept : function() {
         var address = vI_helper.parseAddress(document.getElementById("sender").value)
-        
-        if (window.arguments[0]["resource"])
-            vI_rdfDataEditor.__rdfDatasource.removeVIdentityFromRDF(window.arguments[0]["resource"])
-            
+                    
         vI_rdfDataEditor.storageExtras.readEditorValues();
         

chrome/content/v_identity/vI_rdfDatasource.js

@@ -237 +237 @@
         var resource = vI_rdfDatasource.__getRDFResourceForVIdentity(recDescription, recType);
         if (!resource) return;
+        else vI_rdfDatasource.removeVIdentityFromRDF(resource); // just to have a clean base
+
         vI_notificationBar.dump("## vI_rdfDatasource: updateRDF " + resource.ValueUTF8 + ".\n");
         vI_rdfDatasource.__setRDFValue(resource, "email", localIdentityData.email)

chrome/content/v_identity/vI_storage.js

@@ -174 +174 @@
         this.__setLabels();
         var string = "";
+        var saveBaseId = (vI_statusmenu.objSaveBaseIDMenuItem.getAttribute("checked") == "true")
         for each (item in Items) {
             var classEqual = (this.comp.equals[item])?"equal":"unequal";
+            var classBaseID = ((!saveBaseId) && (item == "idName"))?"ignoreBaseId":""
             string += "<tr>" +
                 "<td class='col1 " + classEqual + "'>" + this.comp.labels[item] + "</td>" +
-                "<td class='col2 " + classEqual + "'>" + this.comp.compareID[item].replace(/>/g,"&gt;").replace(/</g,"&lt;") + "</td>" +
-                "<td class='col3 " + classEqual + "'>" + this[item].replace(/>/g,"&gt;").replace(/</g,"&lt;") + "</td>" +
+                "<td class='col2 " + classEqual + " " + classBaseID + "'>" + this.comp.compareID[item].replace(/>/g,"&gt;").replace(/</g,"&lt;") + "</td>" +
+                "<td class='col3 " + classEqual + " " + classBaseID + "'>" + this[item].replace(/>/g,"&gt;").replace(/</g,"&lt;") + "</td>" +
                 "</tr>"
         }

chrome/content/v_identity/vI_upgrade.js

@@ -117 +117 @@
     
     __removeQuotesFromResourceNameCallback : function(resource, type, name, localIdentityData) {
-        vI_rdfDatasource.removeVIdentityFromRDF(resource);
         vI_rdfDatasource.updateRDF(name, type, localIdentityData);
         vI_notificationBar.quiet = null;

chrome/skin/classic/v_identity/vI_DialogBrowser.css

@@ -73 +73 @@
 }
 
+.updateStorage .ignoreBaseId.col2 {
+    font-weight: normal;
+    text-decoration: line-through;
+}
+
 .question {
     text-align: right;