Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-28 19:49:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Webpack2 (first look)

Browse source 
Small fixes
This commit is contained in:
RainLoop Team 2016-05-26 01:38:32 +03:00
parent 0e775dd5d4
commit c443f54e01
69 changed files with 683 additions and 14390 deletions
Download patch file Download diff file Expand all files Collapse all files

3
dev/View/Popup/ComposeOpenPgp.js
View file

@ -184,7 +184,6 @@
{
if (oPrivateKey && 0 === aPublicKeys.length)
{
// oPromise = PgpStore.openpgp.signClearMessage([oPrivateKey], self.text()); // 1.2.0
oPromise = PgpStore.openpgp.sign({
data: self.text(),
privateKeys: [oPrivateKey]
@ -192,7 +191,6 @@
}
else if (oPrivateKey && 0 < aPublicKeys.length)
{
// oPromise = PgpStore.openpgp.signAndEncryptMessage(aPublicKeys, oPrivateKey, self.text()); // 1.2.0
oPromise = PgpStore.openpgp.encrypt({
data: self.text(),
publicKeys: aPublicKeys,
@ -201,7 +199,6 @@
}
else if (!oPrivateKey && 0 < aPublicKeys.length)
{
// oPromise = PgpStore.openpgp.encryptMessage(aPublicKeys, self.text()); // 1.2.0
oPromise = PgpStore.openpgp.encrypt({
data: self.text(),
publicKeys: aPublicKeys

10
dev/View/Popup/NewOpenPgpKey.js
View file

@ -41,7 +41,7 @@
var
self = this,
oUserIds = {},
oUserId = {},
oOpenpgpKeyring = PgpStore.openpgpKeyring
;
@ -51,10 +51,10 @@
return false;
}
oUserIds['email'] = this.email();
oUserId['email'] = this.email();
if ('' !== this.name())
{
oUserIds['name'] = this.name();
oUserId['name'] = this.name();
}
this.submitRequest(true);
@ -65,8 +65,8 @@
try {
mPromise = PgpStore.openpgp.generateKeyPair({
'userId': oUserIds,
mPromise = PgpStore.openpgp.generateKey({
'userIds': [oUserId],
'numBits': Utils.pInt(self.keyBitLength()),
'passphrase': Utils.trim(self.password())
});