moparisthebest
/
mail
mirror of https://github.com/moparisthebest/mail
1
0
Fork 0
Code Issues Releases Wiki Activity

finish integrating and end review

This commit is contained in:
Tankred Hase 2014-02-06 19:19:00 +01:00
parent 6cd57fa0f6
commit 7c76156adf
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -12,7 +12,7 @@
"dependencies": { "dependencies": {
"crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/master", "crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/master",
"imap-client": "https://github.com/whiteout-io/imap-client/tarball/dev/attachments", "imap-client": "https://github.com/whiteout-io/imap-client/tarball/dev/attachments",
"pgpmailer": "https://github.com/whiteout-io/pgpmailer/tarball/dev/attachments", "pgpmailer": "https://github.com/whiteout-io/pgpmailer/tarball/master",
"requirejs": "2.1.10" "requirejs": "2.1.10"
}, },
"devDependencies": { "devDependencies": {

6
src/js/controller/write.js
View File

@ -466,9 +466,9 @@ define(function(require) {
var reader = new FileReader(); var reader = new FileReader();
reader.onload = function(e) { reader.onload = function(e) {
scope.attachments.push({ scope.attachments.push({
fileName: file.name, filename: file.name,
contentType: file.type, mimeType: file.type,
uint8Array: new Uint8Array(e.target.result) content: new Uint8Array(e.target.result)
}); });
scope.$apply(); scope.$apply();
}; };

6
src/js/dao/email-dao.js
View File

@ -995,14 +995,14 @@ define(function(require) {
// PGP Mailer API // PGP Mailer API
/** /**
* Login the smtp client * Login the smtp client
*/ */
EmailDAO.prototype._pgpmailerLogin = function() { EmailDAO.prototype._pgpmailerLogin = function() {
this._pgpMailer.login(); this._pgpMailer.login();
}; };
// IMAP API // IMAP API
@ -1212,7 +1212,6 @@ define(function(require) {
// store to local storage // store to local storage
self._devicestorage.storeList([email], dbType, callback); self._devicestorage.storeList([email], dbType, callback);
}); });
}); });
}; };
@ -1253,7 +1252,6 @@ define(function(require) {
}); });
mail.encrypted = true; mail.encrypted = true;
}); });
}); });
}); });
}; };

2
src/tpl/write.html
View File

@ -36,7 +36,7 @@
<div class="attachments-box"> <div class="attachments-box">
<span ng-repeat="attachment in attachments" class="attachment"> <span ng-repeat="attachment in attachments" class="attachment">
<span data-icon="&#xe003;"></span> <span data-icon="&#xe003;"></span>
{{attachment.fileName}} {{attachment.filename}}
<span class="close" data-icon="&#xe000;" ng-click="remove(attachment)"></span> <span class="close" data-icon="&#xe000;" ng-click="remove(attachment)"></span>
</span><!--/.attachment--> </span><!--/.attachment-->
</div><!--/.attachments-box--> </div><!--/.attachments-box-->