Merge branch 'master' into js-unit-testing

This commit is contained in:
El RIDO 2017-03-26 06:46:42 +02:00
commit 6fb3fe51b2
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
14 changed files with 110 additions and 50 deletions

View file

@ -2080,7 +2080,8 @@ jQuery.PrivateBin = function($, sjcl, Base64, RawDeflate) {
*/
me.hasAttachment = function()
{
return ($attachmentLink.prop('href') !== '')
var link = $attachmentLink.prop('href');
return (typeof link !== 'undefined' && link !== '')
}
/**