diff --git a/Gruntfile.js b/Gruntfile.js index e9b938c00..0183f688e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -83,6 +83,7 @@ module.exports = function(grunt) { 'js/shell.js', // shell must be loaded before moment due to the way moment loads in a commonjs env 'lib/moment/min/moment.min.js', 'lib/qrcode-generator/js/qrcode.js', + 'lib/underscore/underscore.js', 'lib/bitcore.js', 'lib/crypto-js/rollups/sha256.js', 'lib/crypto-js/rollups/pbkdf2.js', diff --git a/bower.json b/bower.json index d58a6e511..331b065ca 100644 --- a/bower.json +++ b/bower.json @@ -21,7 +21,8 @@ "socket.io-client": ">=1.0.0", "mousetrap": "1.4.6", "zeroclipboard": "~1.3.5", - "ng-idle": "*" + "ng-idle": "*", + "underscore": "~1.7.0" }, "resolutions": { "angular": "=1.2.19" diff --git a/karma.conf.js b/karma.conf.js index 74d8f7377..bc467f9bb 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -29,6 +29,7 @@ module.exports = function(config) { 'lib/angular-foundation/mm-foundation.min.js', 'lib/angular-foundation/mm-foundation-tpls.min.js', 'lib/bitcore.js', + 'lib/underscore/underscore.js', 'lib/crypto-js/rollups/sha256.js', 'lib/crypto-js/rollups/pbkdf2.js', 'lib/crypto-js/rollups/aes.js', diff --git a/package.json b/package.json index 258a25603..c970b0737 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,8 @@ "optimist": "^0.6.1", "preconditions": "^1.0.7", "request": "^2.40.0", - "sinon": "1.9.1" + "sinon": "1.9.1", + "underscore": "^1.7.0" }, "scripts": { "shell": "node shell/scripts/launch.js", @@ -72,7 +73,7 @@ "travis-cov": "0.2.5", "uglifyify": "1.2.3", "crypto-js": "3.1.2", - "shelljs":"0.3.0", + "shelljs": "0.3.0", "browser-request": "0.3.2", "request": "2.40.0" }, diff --git a/util/build.js b/util/build.js index bcd6f5ec1..c3b8b7bd6 100644 --- a/util/build.js +++ b/util/build.js @@ -43,6 +43,9 @@ var createBundle = function(opts) { b.require('browser-request', { expose: 'request' }); + b.require('underscore', { + expose: 'underscore' + }); b.require('./copay', { expose: 'copay'