mirror of
https://github.com/moparisthebest/mail
synced 2024-08-13 16:43:47 -04:00
finish integrating and end review
This commit is contained in:
parent
6cd57fa0f6
commit
7c76156adf
@ -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": {
|
||||||
|
@ -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();
|
||||||
};
|
};
|
||||||
|
@ -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;
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
@ -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=""></span>
|
<span data-icon=""></span>
|
||||||
{{attachment.fileName}}
|
{{attachment.filename}}
|
||||||
<span class="close" data-icon="" ng-click="remove(attachment)"></span>
|
<span class="close" data-icon="" ng-click="remove(attachment)"></span>
|
||||||
</span><!--/.attachment-->
|
</span><!--/.attachment-->
|
||||||
</div><!--/.attachments-box-->
|
</div><!--/.attachments-box-->
|
||||||
|
Loading…
Reference in New Issue
Block a user