Changeset 7c85ef for modules/vI_rdfDatasource.js

Timestamp:

Mar 24, 2012, 8:33:52 PM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

d415fa

Parents:

9258d9

Message:

refer to window if opening dialogs

File:

• modules/vI_rdfDatasource.js (modified) (7 diffs)

modules/vI_rdfDatasource.js

@@ -877 +877 @@
     },
     
-    updateVIdentityFromStorage : function(recipientName, recipientType, currentIdentity, currentIdentityIsVid, isNotFirstInputElement) {
+    updateVIdentityFromStorage : function(recipientName, recipientType, currentIdentity, currentIdentityIsVid, isNotFirstInputElement, currentWindow) {
         var localIdentities = new identityCollection();
         localIdentities.addWithoutDuplicates(this._rdfDataSource.readVIdentityFromRDF(recipientName, recipientType));
@@ -903 +903 @@
                     if (    !currentIdentityIsVid ||
                         !vIprefs.get("storage_warn_vI_replace") ||
-                        (this.__askWarning(warning) == "accept")) {
+                        (this.__askWarning(warning, currentWindow) == "accept")) {
                             returnValue.result = "accept";
                     }
@@ -915 +915 @@
     },
     
-    storeVIdentityToAllRecipients : function(identityData, recipients) {
+    storeVIdentityToAllRecipients : function(identityData, recipients, currentWindow) {
         var multipleRecipients = (recipients.length > 1);
         var dontUpdateMultipleNoEqual = (vIprefs.get("storage_dont_update_multiple") && multipleRecipients)
@@ -922 +922 @@
         let returnValue = { update : "cancel" };
         for (var j = 0; j < recipients.length; j++) {
-            returnValue = this.__updateStorageFromVIdentity(identityData, recipients[j].recipient, recipients[j].recipientType, dontUpdateMultipleNoEqual);
+            returnValue = this.__updateStorageFromVIdentity(identityData, recipients[j].recipient, recipients[j].recipientType, dontUpdateMultipleNoEqual, currentWindow);
             if (returnValue.update != "accept")  break;
         }
@@ -939 +939 @@
     },
 
-    __updateStorageFromVIdentity : function(identityData, recipient, recipientType, dontUpdateMultipleNoEqual) {
+    __updateStorageFromVIdentity : function(identityData, recipient, recipientType, dontUpdateMultipleNoEqual, currentWindow) {
         Log.debug("__updateStorageFromVIdentity.")
         var storageDataByType = this._rdfDataSource.readVIdentityFromRDF(recipient, recipientType);
@@ -956 +956 @@
             if (storageDataByType && !storageDataByTypeEqual && vIprefs.get("storage_warn_update")) {
                 Log.debug("__updateStorageFromVIdentity overwrite warning");
-                doUpdate = this.__askWarning(this.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix));
+                doUpdate = this.__askWarning(this.__getWarning("updateStorage", recipient, storageDataByTypeCompResult.compareMatrix), currentWindow);
             }
         }
@@ -981 +981 @@
     },
 
-    __askWarning : function(warning) {
+    __askWarning : function(warning, currentWindow) {
         var retVar = { returnValue: null };
-        var answer = get3PaneWindow().openDialog("chrome://v_identity/content/vI_Dialog.xul","",
+        var answer = currentWindow.openDialog("chrome://v_identity/content/vI_Dialog.xul","",
                     "chrome, dialog, modal, alwaysRaised, resizable=yes",
                      warning, retVar)