aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Krambach <[email protected]>2018-08-27 09:21:02 +0000
committerMaximilian Krambach <[email protected]>2018-08-27 09:21:02 +0000
commit557fec600248e6ad413af01c9a53d4993f36af0c (patch)
treefbf66729f6db4dbc812b7fe5f9b6a6a3e96c61a2
parentcore: Export gpgme_data_new_from_estream function. (diff)
downloadgpgme-557fec600248e6ad413af01c9a53d4993f36af0c.tar.gz
gpgme-557fec600248e6ad413af01c9a53d4993f36af0c.zip
js: fix file_name return on decrypt
-- * src/gpgmejs: Line 228 checked the wrong variable. To avoid further confusion, _result was renamed to returnValue in the whole file
-rw-r--r--lang/js/src/gpgmejs.js34
1 files changed, 17 insertions, 17 deletions
diff --git a/lang/js/src/gpgmejs.js b/lang/js/src/gpgmejs.js
index 1a5d5574..5bdffeb5 100644
--- a/lang/js/src/gpgmejs.js
+++ b/lang/js/src/gpgmejs.js
@@ -217,28 +217,28 @@ export class GpgME {
putData(msg, data);
return new Promise(function (resolve, reject){
msg.post().then(function (result){
- let _result = { data: result.data };
- _result.format = result.format ? result.format : null;
+ let returnValue = { data: result.data };
+ returnValue.format = result.format ? result.format : null;
if (result.hasOwnProperty('dec_info')){
- _result.is_mime = result.dec_info.is_mime ? true: false;
+ returnValue.is_mime = result.dec_info.is_mime ? true: false;
if (result.dec_info.file_name) {
- _result.file_name = result.dec_info.file_name;
+ returnValue.file_name = result.dec_info.file_name;
}
}
- if (!result.file_name) {
- _result.file_name = null;
+ if (!returnValue.file_name) {
+ returnValue.file_name = null;
}
if (result.hasOwnProperty('info')
&& result.info.hasOwnProperty('signatures')
&& Array.isArray(result.info.signatures)
) {
- _result.signatures = collectSignatures(
+ returnValue.signatures = collectSignatures(
result.info.signatures);
}
- if (_result.signatures instanceof Error){
- reject(_result.signatures);
+ if (returnValue.signatures instanceof Error){
+ reject(returnValue.signatures);
} else {
- resolve(_result);
+ resolve(returnValue);
}
}, function (error){
reject(error);
@@ -330,18 +330,18 @@ export class GpgME {
if (!message.info || !message.info.signatures){
reject(gpgme_error('SIG_NO_SIGS'));
} else {
- let _result = {
+ let returnValue = {
signatures: collectSignatures(message.info.signatures)
};
- if (_result.signatures instanceof Error){
- reject(_result.signatures);
+ if (returnValue.signatures instanceof Error){
+ reject(returnValue.signatures);
} else {
- _result.is_mime = message.info.is_mime? true: false;
+ returnValue.is_mime = message.info.is_mime? true: false;
if (message.info.filename){
- _result.file_name = message.info.filename;
+ returnValue.file_name = message.info.filename;
}
- _result.data = message.data;
- resolve(_result);
+ returnValue.data = message.data;
+ resolve(returnValue);
}
}
}, function (error){