From ad5617dc7da9b84ec6fc5f1f042273445cc7df32 Mon Sep 17 00:00:00 2001 From: Mario Volke Date: Mon, 15 Sep 2014 12:01:13 +0200 Subject: [PATCH] added lib ngTagsInput to the app --- Gruntfile.js | 3 +- package.json | 117 +++++++++++++++++++++++------------------- src/js/app.js | 6 ++- src/require-config.js | 5 ++ 4 files changed, 75 insertions(+), 56 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 377eb50..5863bdf 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -123,7 +123,8 @@ module.exports = function(grunt) { 'axe-logger/axe.js', 'dompurify/purify.js', 'jquery/dist/jquery.min.js', - 'ng-infinite-scroll/build/ng-infinite-scroll.min.js' + 'ng-infinite-scroll/build/ng-infinite-scroll.min.js', + 'ng-tags-input/build/ng-tags-input.min.js' ], dest: 'src/lib/' }, diff --git a/package.json b/package.json index eda180c..77b3df7 100644 --- a/package.json +++ b/package.json @@ -1,54 +1,65 @@ { - "name": "whiteout-mail", - "version": "0.0.1", - "description": "Mail App with integrated OpenPGP encryption.", - "author": "Whiteout Networks", - "homepage": "https://whiteout.io", - "repository": { - "type": "git", - "url": "https://github.com/whiteout-io/mail-html5.git" - }, - "keywords": ["email", "mail", "client", "app", "openpgp", "pgp", "gpg", "imap", "smtp"], - "engines": { - "node": ">=0.10" - }, - "scripts": { - "postinstall": "grunt", - "test": "grunt && grunt test", - "start": "node server.js" - }, - "dependencies": { - "axe-logger": "~0.0.2", - "compression": "^1.0.11", - "crypto-lib": "~0.2.1", - "dompurify": "~0.4.2", - "express": "^4.8.3", - "imap-client": "~0.4.0", - "jquery": "~2.1.1", - "mailreader": "~0.3.5", - "ng-infinite-scroll": "~1.1.2", - "pgpbuilder": "~0.4.0", - "pgpmailer": "~0.4.0", - "requirejs": "~2.1.14" - }, - "devDependencies": { - "angularjs": "https://github.com/whiteout-io/angular.js/tarball/npm-version", - "browsercrow": "https://github.com/whiteout-io/browsercrow/tarball/master", - "browsersmtp": "https://github.com/whiteout-io/browsersmtp/tarball/master", - "grunt": "~0.4.1", - "mocha": "~1.13.0", - "chai": "~1.7.2", - "sinon": "~1.7.3", - "grunt-contrib-connect": "~0.5.0", - "grunt-contrib-jshint": "~0.6.4", - "grunt-mocha": "~0.4.1", - "grunt-contrib-clean": "~0.5.0", - "grunt-csso": "~0.6.1", - "grunt-contrib-sass": "~0.7.3", - "grunt-autoprefixer": "~0.7.2", - "grunt-contrib-watch": "~0.5.3", - "grunt-contrib-copy": "~0.4.1", - "grunt-contrib-compress": "~0.5.2", - "grunt-node-webkit-builder": "~0.1.17" - } -} \ No newline at end of file + "name": "whiteout-mail", + "version": "0.0.1", + "description": "Mail App with integrated OpenPGP encryption.", + "author": "Whiteout Networks", + "homepage": "https://whiteout.io", + "repository": { + "type": "git", + "url": "https://github.com/whiteout-io/mail-html5.git" + }, + "keywords": [ + "email", + "mail", + "client", + "app", + "openpgp", + "pgp", + "gpg", + "imap", + "smtp" + ], + "engines": { + "node": ">=0.10" + }, + "scripts": { + "postinstall": "grunt", + "test": "grunt && grunt test", + "start": "node server.js" + }, + "dependencies": { + "axe-logger": "~0.0.2", + "compression": "^1.0.11", + "crypto-lib": "~0.2.1", + "dompurify": "~0.4.2", + "express": "^4.8.3", + "imap-client": "~0.4.0", + "jquery": "~2.1.1", + "mailreader": "~0.3.5", + "ng-infinite-scroll": "~1.1.2", + "pgpbuilder": "~0.4.0", + "pgpmailer": "~0.4.0", + "requirejs": "~2.1.14", + "ng-tags-input": "~2.1.1-1" + }, + "devDependencies": { + "angularjs": "https://github.com/whiteout-io/angular.js/tarball/npm-version", + "browsercrow": "https://github.com/whiteout-io/browsercrow/tarball/master", + "browsersmtp": "https://github.com/whiteout-io/browsersmtp/tarball/master", + "grunt": "~0.4.1", + "mocha": "~1.13.0", + "chai": "~1.7.2", + "sinon": "~1.7.3", + "grunt-contrib-connect": "~0.5.0", + "grunt-contrib-jshint": "~0.6.4", + "grunt-mocha": "~0.4.1", + "grunt-contrib-clean": "~0.5.0", + "grunt-csso": "~0.6.1", + "grunt-contrib-sass": "~0.7.3", + "grunt-autoprefixer": "~0.7.2", + "grunt-contrib-watch": "~0.5.3", + "grunt-contrib-copy": "~0.4.1", + "grunt-contrib-compress": "~0.5.2", + "grunt-node-webkit-builder": "~0.1.17" + } +} diff --git a/src/js/app.js b/src/js/app.js index 40b6465..0051cda 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -27,7 +27,8 @@ requirejs([ 'fastclick', 'angularRoute', 'angularAnimate', - 'ngInfiniteScroll' + 'ngInfiniteScroll', + 'ngTagsInput' ], function( angular, DialogCtrl, @@ -70,7 +71,8 @@ requirejs([ 'login-new-device', 'privatekey-upload', 'popover', - 'infinite-scroll' + 'infinite-scroll', + 'ngTagsInput' ]); // set router paths diff --git a/src/require-config.js b/src/require-config.js index 1b1054f..4bf2365 100644 --- a/src/require-config.js +++ b/src/require-config.js @@ -16,6 +16,7 @@ angularRoute: 'angular/angular-route.min', angularAnimate: 'angular/angular-animate.min', ngInfiniteScroll: 'ng-infinite-scroll.min', + ngTagsInput: 'ng-tags-input.min', uuid: 'uuid/uuid', forge: 'forge/forge.min', punycode: 'punycode.min', @@ -45,6 +46,10 @@ exports: 'angular', deps: ['jquery', 'angular'] }, + ngTagsInput: { + exports: 'angular', + deps: ['angular'] + }, lawnchair: { exports: 'Lawnchair' },