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

removed unnecessary email model code

This commit is contained in:
Tankred Hase 2013-06-06 22:05:37 +02:00
parent 9842a060ad
commit 1491e9fd1d
7 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/index.html
View File

@ -20,10 +20,8 @@
<script src="js/app-config.js"></script>
<script src="js/model/email-model.js"></script>
<script src="js/model/folder-model.js"></script>
<script src="js/model/account-model.js"></script>
<script src="js/model/publickey-model.js"></script>
<script src="js/crypto/util.js"></script>
<script src="js/crypto/pbkdf2.js"></script>

10
src/js/view/compose-view.js
View File

@ -23,7 +23,7 @@
return;
}
// set mail to reply to
self.replyTo = new app.model.Email(resArgs.email);
self.replyTo = resArgs.email;
args.callback(self);
});
@ -59,8 +59,8 @@
fillFields: function() {
var page = $(this.el),
re = this.replyTo,
from = re.get('from')[0],
subject = re.get('subject');
from = re.from[0],
subject = re.subject;
// fill recipient field
var replyToAddress = from.address;
@ -71,8 +71,8 @@
page.find('#subjectInput').val(subject);
// fill text body
var body = '\n\n' + re.get('sentDate') + ' ' + from.name + ' <' + from.address + '>\n';
var bodyRows = re.get('body').split('\n');
var body = '\n\n' + re.sentDate + ' ' + from.name + ' <' + from.address + '>\n';
var bodyRows = re.body.split('\n');
var isHtml = false;
_.each(bodyRows, function(row) {
if (row.indexOf('</') !== -1) {

6
src/js/view/read-view.js
View File

@ -20,13 +20,13 @@
return;
}
// set mail to reply to
self.model = new app.model.Email(resArgs.email);
self.model = resArgs.email;
args.callback(self);
});
},
render: function() {
var params = this.model.toJSON();
var params = this.model;
params.account = this.account;
params.folder = this.folder;
params.id = encodeURIComponent(params.id);
@ -39,7 +39,7 @@
renderBody: function(tryHtml) {
var page = $(this.el),
emailBody = this.model.get('body');
emailBody = this.model.body;
if (!tryHtml && emailBody.indexOf('</') === -1) {
// render text email

2
src/mobile.html
View File

@ -23,10 +23,8 @@
<script src="js/app-config.js"></script>
<script src="js/model/email-model.js"></script>
<script src="js/model/folder-model.js"></script>
<script src="js/model/account-model.js"></script>
<script src="js/model/publickey-model.js"></script>
<script src="js/crypto/util.js"></script>
<script src="js/crypto/pbkdf2.js"></script>

5
src/sandbox.html
View File

@ -15,11 +15,6 @@
<script src="lib/jquery.mobile-1.2.0.min.js"></script>
<script src="js/app-config.js"></script>
<script src="js/model/email-model.js"></script>
<script src="js/model/folder-model.js"></script>
<script src="js/model/account-model.js"></script>
<script src="js/model/publickey-model.js"></script>
<script src="js/view/login-view.js"></script>
<script src="js/view/compose-view.js"></script>

1
test/integration/index.html
View File

@ -36,7 +36,6 @@
<script src="../../src/js/model/email-model.js"></script>
<script src="../../src/js/model/folder-model.js"></script>
<script src="../../src/js/model/account-model.js"></script>
<script src="../../src/js/model/publickey-model.js"></script>
<script src="../../src/js/crypto/util.js"></script>
<script src="../../src/js/crypto/pbkdf2.js"></script>

1
test/unit/index.html
View File

@ -37,7 +37,6 @@
<script src="../../src/js/model/email-model.js"></script>
<script src="../../src/js/model/folder-model.js"></script>
<script src="../../src/js/model/account-model.js"></script>
<script src="../../src/js/model/publickey-model.js"></script>
<script src="../../src/js/crypto/util.js"></script>
<script src="../../src/js/crypto/pbkdf2.js"></script>