Updated: ckeditor 4.5.3, jquery 1.11.3, openpgpjs 1.2.0

OpenPGP decrypt fix
+ Small fixes
This commit is contained in:
RainLoop Team 2015-09-17 22:48:52 +03:00
parent 4deb083d7d
commit 87887373c1
370 changed files with 10805 additions and 5637 deletions

View file

@ -196,6 +196,16 @@
this.hasFlaggedSubMessage(false);
};
/**
* @return {Array}
*/
MessageModel.prototype.getRecipientsEmails = function ()
{
return _.compact(_.uniq(_.map(this.to.concat(this.cc), function (oItem) {
return oItem ? oItem.email : '';
})));
};
/**
* @return {string}
*/

View file

@ -49,7 +49,7 @@
OpenPgpKeyModel.prototype.armor = '';
OpenPgpKeyModel.prototype.isPrivate = false;
OpenPgpKeyModel.prototype.getNativeKeys = function ()
OpenPgpKeyModel.prototype.getNativeKey = function ()
{
var oKey = null;
try
@ -57,17 +57,23 @@
oKey = PgpStore.openpgp.key.readArmored(this.armor);
if (oKey && !oKey.err && oKey.keys && oKey.keys[0])
{
return oKey.keys;
return oKey;
}
}
catch (e)
{
Utils.log(e);
}
return null;
};
OpenPgpKeyModel.prototype.getNativeKeys = function ()
{
var oKey = this.getNativeKey();
return oKey && oKey.keys ? oKey.keys : null;
};
module.exports = OpenPgpKeyModel;
}());