From 58eb7ecb6d4a180694bf63d1fce782fbd4b8fd76 Mon Sep 17 00:00:00 2001 From: Felix Hammerl Date: Mon, 3 Mar 2014 21:02:14 +0100 Subject: [PATCH 1/2] offload mail parsing to web worker --- package.json | 2 +- src/js/app-controller.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 46c0b4d..471e92d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies": { "crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/master", "imap-client": "https://github.com/whiteout-io/imap-client/tarball/master", - "mailreader": "https://github.com/whiteout-io/mailreader/tarball/master", + "mailreader": "https://github.com/whiteout-io/mailreader/tarball/dev/worker", "pgpmailer": "https://github.com/whiteout-io/pgpmailer/tarball/master", "pgpbuilder": "https://github.com/whiteout-io/pgpbuilder/tarball/master", "requirejs": "2.1.10" diff --git a/src/js/app-controller.js b/src/js/app-controller.js index 562d7b6..f03e0e2 100644 --- a/src/js/app-controller.js +++ b/src/js/app-controller.js @@ -337,6 +337,8 @@ define(function(require) { var lawnchairDao, restDao, pubkeyDao, invitationDao, emailDao, keychain, pgp, userStorage, pgpbuilder; + mailreader.startWorker(config.workerPath + '/../lib/mailreader-parser-worker.js'); + // init objects and inject dependencies restDao = new RestDAO(); pubkeyDao = new PublicKeyDAO(restDao); From e9e453e4569d89c83b55c6226a1e204bbc734a29 Mon Sep 17 00:00:00 2001 From: Tankred Hase Date: Wed, 5 Mar 2014 15:06:09 +0100 Subject: [PATCH 2/2] Update package.json --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 471e92d..f334c4b 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies": { "crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/master", "imap-client": "https://github.com/whiteout-io/imap-client/tarball/master", - "mailreader": "https://github.com/whiteout-io/mailreader/tarball/dev/worker", + "mailreader": "https://github.com/whiteout-io/mailreader/tarball/master", "pgpmailer": "https://github.com/whiteout-io/pgpmailer/tarball/master", "pgpbuilder": "https://github.com/whiteout-io/pgpbuilder/tarball/master", "requirejs": "2.1.10" @@ -36,4 +36,4 @@ "grunt-contrib-compress": "~0.5.2", "grunt-node-webkit-builder": "~0.1.17" } -} \ No newline at end of file +}