From 1491e9fd1dee98bb401388c872b946f6d116cfe4 Mon Sep 17 00:00:00 2001
From: Tankred Hase <mail@tankredhase.de>
Date: Thu, 6 Jun 2013 22:05:37 +0200
Subject: [PATCH] removed unnecessary email model code

---
 src/index.html              |  2 --
 src/js/view/compose-view.js | 10 +++++-----
 src/js/view/read-view.js    |  6 +++---
 src/mobile.html             |  2 --
 src/sandbox.html            |  5 -----
 test/integration/index.html |  1 -
 test/unit/index.html        |  1 -
 7 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/index.html b/src/index.html
index 1b1602f..f505c6c 100755
--- a/src/index.html
+++ b/src/index.html
@@ -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>
diff --git a/src/js/view/compose-view.js b/src/js/view/compose-view.js
index e41efd8..0ad854a 100644
--- a/src/js/view/compose-view.js
+++ b/src/js/view/compose-view.js
@@ -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) {
diff --git a/src/js/view/read-view.js b/src/js/view/read-view.js
index fe0ed48..ba3a20a 100644
--- a/src/js/view/read-view.js
+++ b/src/js/view/read-view.js
@@ -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
diff --git a/src/mobile.html b/src/mobile.html
index bb80364..97244a2 100644
--- a/src/mobile.html
+++ b/src/mobile.html
@@ -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>
diff --git a/src/sandbox.html b/src/sandbox.html
index 9153873..b42eaef 100644
--- a/src/sandbox.html
+++ b/src/sandbox.html
@@ -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>
diff --git a/test/integration/index.html b/test/integration/index.html
index 9793584..467e9c6 100644
--- a/test/integration/index.html
+++ b/test/integration/index.html
@@ -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>
diff --git a/test/unit/index.html b/test/unit/index.html
index e00046e..3255f8e 100644
--- a/test/unit/index.html
+++ b/test/unit/index.html
@@ -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>