summaryrefslogtreecommitdiffstats
path: root/security/manager/pki/resources
diff options
context:
space:
mode:
Diffstat (limited to 'security/manager/pki/resources')
-rw-r--r--security/manager/pki/resources/content/certManager.js8
-rw-r--r--security/manager/pki/resources/content/load_device.js6
-rw-r--r--security/manager/pki/resources/content/pippki.js6
3 files changed, 12 insertions, 8 deletions
diff --git a/security/manager/pki/resources/content/certManager.js b/security/manager/pki/resources/content/certManager.js
index b1fcaff30f..660240ff56 100644
--- a/security/manager/pki/resources/content/certManager.js
+++ b/security/manager/pki/resources/content/certManager.js
@@ -541,7 +541,7 @@ async function backupCerts() {
{ id: "choose-p12-backup-file-dialog" },
{ id: "file-browse-pkcs12-spec" },
]);
- fp.init(window, backupFileDialog, Ci.nsIFilePicker.modeSave);
+ fp.init(window.browsingContext, backupFileDialog, Ci.nsIFilePicker.modeSave);
fp.appendFilter(filePkcs12Spec, "*.p12");
fp.appendFilters(Ci.nsIFilePicker.filterAll);
fp.defaultExtension = "p12";
@@ -590,7 +590,7 @@ async function restoreCerts() {
{ id: "file-browse-pkcs12-spec" },
{ id: "file-browse-certificate-spec" },
]);
- fp.init(window, restoreFileDialog, Ci.nsIFilePicker.modeOpen);
+ fp.init(window.browsingContext, restoreFileDialog, Ci.nsIFilePicker.modeOpen);
fp.appendFilter(filePkcs12Spec, "*.p12; *.pfx");
fp.appendFilter(fileCertSpec, gCertFileTypes);
fp.appendFilters(Ci.nsIFilePicker.filterAll);
@@ -736,7 +736,7 @@ async function addCACerts() {
{ id: "import-ca-certs-prompt" },
{ id: "file-browse-certificate-spec" },
]);
- fp.init(window, importCa, Ci.nsIFilePicker.modeOpen);
+ fp.init(window.browsingContext, importCa, Ci.nsIFilePicker.modeOpen);
fp.appendFilter(fileCertSpec, gCertFileTypes);
fp.appendFilters(Ci.nsIFilePicker.filterAll);
fp.open(rv => {
@@ -755,7 +755,7 @@ async function addEmailCert() {
{ id: "import-email-cert-prompt" },
{ id: "file-browse-certificate-spec" },
]);
- fp.init(window, importEmail, Ci.nsIFilePicker.modeOpen);
+ fp.init(window.browsingContext, importEmail, Ci.nsIFilePicker.modeOpen);
fp.appendFilter(fileCertSpec, gCertFileTypes);
fp.appendFilters(Ci.nsIFilePicker.filterAll);
fp.open(rv => {
diff --git a/security/manager/pki/resources/content/load_device.js b/security/manager/pki/resources/content/load_device.js
index 0f77e1f1bd..ac122851e0 100644
--- a/security/manager/pki/resources/content/load_device.js
+++ b/security/manager/pki/resources/content/load_device.js
@@ -16,7 +16,11 @@ async function onBrowseBtnPress() {
let [loadPK11ModuleFilePickerTitle] = await document.l10n.formatValues([
{ id: "load-pk11-module-file-picker-title" },
]);
- fp.init(window, loadPK11ModuleFilePickerTitle, Ci.nsIFilePicker.modeOpen);
+ fp.init(
+ window.browsingContext,
+ loadPK11ModuleFilePickerTitle,
+ Ci.nsIFilePicker.modeOpen
+ );
fp.appendFilters(Ci.nsIFilePicker.filterAll);
fp.open(rv => {
if (rv == Ci.nsIFilePicker.returnOK) {
diff --git a/security/manager/pki/resources/content/pippki.js b/security/manager/pki/resources/content/pippki.js
index 8094074281..91cc68972e 100644
--- a/security/manager/pki/resources/content/pippki.js
+++ b/security/manager/pki/resources/content/pippki.js
@@ -127,7 +127,7 @@ async function exportToFile(parent, cert) {
);
var fp = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
- fp.init(parent, saveCertAs, Ci.nsIFilePicker.modeSave);
+ fp.init(parent.browsingContext, saveCertAs, Ci.nsIFilePicker.modeSave);
fp.defaultString = certToFilename(cert);
fp.defaultExtension = DEFAULT_CERT_EXTENSION;
for (let format of Object.values(formats)) {
@@ -225,7 +225,7 @@ function asyncDetermineUsages(cert) {
);
Object.keys(certificateUsages).forEach(usageString => {
promises.push(
- new Promise((resolve, reject) => {
+ new Promise(resolve => {
let usage = certificateUsages[usageString];
certdb.asyncVerifyCertAtTime(
cert,
@@ -233,7 +233,7 @@ function asyncDetermineUsages(cert) {
0,
null,
now,
- (aPRErrorCode, aVerifiedChain, aHasEVPolicy) => {
+ (aPRErrorCode, aVerifiedChain) => {
resolve({
usageString,
errorCode: aPRErrorCode,