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

Merge pull request #51 from whiteout-io/dev/browser 

Dev/browser
This commit is contained in:
Tankred Hase 2014-04-24 14:55:08 +02:00
parent 7a160d36df a10dd34794
commit 548abcfc01
5 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Gruntfile.js
View File

@ -126,24 +126,22 @@ module.exports = function(grunt) {
cwd: 'node_modules/', cwd: 'node_modules/',
src: [ src: [
'requirejs/require.js', 'requirejs/require.js',
'crypto-lib/node_modules/node-forge/js/*.js',
'imap-client/src/*.js', 'imap-client/src/*.js',
'imap-client/node_modules/inbox/src/*.js', 'imap-client/node_modules/browserbox/src/*.js',
'imap-client/node_modules/setimmediate/setImmediate.js', 'imap-client/node_modules/browserbox/node_modules/imap-handler/src/*.js',
'imap-client/node_modules/inbox/node_modules/node-shims/src/*.js', 'imap-client/node_modules/browserbox/node_modules/mimefuncs/src/*.js',
'imap-client/node_modules/inbox/node_modules/utf7/src/utf7.js', 'imap-client/node_modules/browserbox/node_modules/tcp-socket/src/*.js',
'imap-client/node_modules/inbox/node_modules/xoauth2/src/xoauth2.js', 'imap-client/node_modules/browserbox/node_modules/utf7/src/*.js',
'mailreader/src/*.js', 'mailreader/src/*.js',
'mailreader/node_modules/mailparser/src/*.js', 'mailreader/node_modules/mimeparser/src/*.js',
'mailreader/node_modules/mailparser/node_modules/encoding/src/encoding.js', 'mailreader/node_modules/mimeparser/node_modules/addressparser/src/*.js',
'mailreader/node_modules/mailparser/node_modules/mimelib/src/mimelib.js',
'mailreader/node_modules/mailparser/node_modules/mimelib/node_modules/addressparser/src/addressparser.js',
'mailreader/node_modules/mailparser/node_modules/encoding/node_modules/iconv-lite/src/*.js',
'mailreader/node_modules/mailparser/node_modules/mime/src/mime.js',
'pgpmailer/src/*.js',
'pgpmailer/node_modules/simplesmtp/src/*',
'pgpbuilder/src/*.js', 'pgpbuilder/src/*.js',
'pgpbuilder/node_modules/mailbuilder/src/*.js' 'pgpbuilder/node_modules/mailbuild/src/*.js',
'pgpbuilder/node_modules/mailbuild/node_modules/mimetypes/src/*.js',
'pgpbuilder/node_modules/mailbuild/node_modules/punycode/punycode.min.js',
'pgpmailer/src/*.js',
'pgpmailer/node_modules/smtpclient/src/*.js',
'pgpmailer/node_modules/smtpclient/node_modules/stringencoding/dist/stringencoding.js'
], ],
dest: 'src/lib/' dest: 'src/lib/'
}, },

10
package.json
View File

@ -10,11 +10,11 @@
"start": "grunt && grunt dev" "start": "grunt && grunt dev"
}, },
"dependencies": { "dependencies": {
"crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/v0.1.0", "crypto-lib": "https://github.com/whiteout-io/crypto-lib/tarball/v0.1.1",
"imap-client": "https://github.com/whiteout-io/imap-client/tarball/v0.1.0", "imap-client": "https://github.com/whiteout-io/imap-client/tarball/v0.2.2",
"mailreader": "https://github.com/whiteout-io/mailreader/tarball/v0.1.0", "mailreader": "https://github.com/whiteout-io/mailreader/tarball/v0.2.0",
"pgpmailer": "https://github.com/whiteout-io/pgpmailer/tarball/v0.1.0", "pgpmailer": "https://github.com/whiteout-io/pgpmailer/tarball/dev/browser",
"pgpbuilder": "https://github.com/whiteout-io/pgpbuilder/tarball/v0.1.0", "pgpbuilder": "https://github.com/whiteout-io/pgpbuilder/tarball/v0.2.1",
"requirejs": "2.1.10" "requirejs": "2.1.10"
}, },
"devDependencies": { "devDependencies": {

7
src/js/app-controller.js
View File

@ -107,11 +107,8 @@ define(function(require) {
var auth, imapOptions, imapClient, smtpOptions, pgpMailer; var auth, imapOptions, imapClient, smtpOptions, pgpMailer;
auth = { auth = {
XOAuth2: { user: credentials.emailAddress,
user: credentials.emailAddress, xoauth2: credentials.oauthToken
clientId: config.gmail.clientId,
accessToken: credentials.oauthToken
}
}; };
imapOptions = { imapOptions = {
secure: config.gmail.imap.secure, secure: config.gmail.imap.secure,

1
src/lib/forge/forge.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
src/require-config.js
View File

@ -7,9 +7,7 @@
paths: { paths: {
js: '../js', js: '../js',
test: '../../test', test: '../../test',
'node-forge': 'forge',
cryptoLib: '../js/crypto', cryptoLib: '../js/crypto',
'setimmediate': 'setImmediate',
underscore: 'underscore/underscore-min', underscore: 'underscore/underscore-min',
lawnchair: 'lawnchair/lawnchair-git', lawnchair: 'lawnchair/lawnchair-git',
lawnchairSQL: 'lawnchair/lawnchair-adapter-webkit-sqlite-git', lawnchairSQL: 'lawnchair/lawnchair-adapter-webkit-sqlite-git',
@ -19,10 +17,15 @@
angularTouch: 'angular/angular-touch.min', angularTouch: 'angular/angular-touch.min',
angularSanitize: 'angular/angular-sanitize.min', angularSanitize: 'angular/angular-sanitize.min',
uuid: 'uuid/uuid', uuid: 'uuid/uuid',
forge: 'forge/forge.min',
punycode: 'punycode.min',
openpgp: 'openpgp/openpgp.min', openpgp: 'openpgp/openpgp.min',
iscroll: 'iscroll/iscroll-min' iscroll: 'iscroll/iscroll-min'
}, },
shim: { shim: {
forge: {
exports: 'forge'
},
angular: { angular: {
exports: 'angular' exports: 'angular'
}, },