BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add underscore to bower and karma conf

This commit is contained in:
Esteban Ordano 2014-09-02 10:23:57 -03:00
parent a0c7d2cb66
commit e2df438485
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Gruntfile.js
View File

@ -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 '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/moment/min/moment.min.js',
'lib/qrcode-generator/js/qrcode.js', 'lib/qrcode-generator/js/qrcode.js',
'lib/underscore/underscore.js',
'lib/bitcore.js', 'lib/bitcore.js',
'lib/crypto-js/rollups/sha256.js', 'lib/crypto-js/rollups/sha256.js',
'lib/crypto-js/rollups/pbkdf2.js', 'lib/crypto-js/rollups/pbkdf2.js',

3
bower.json
View File

@ -21,7 +21,8 @@
"socket.io-client": ">=1.0.0", "socket.io-client": ">=1.0.0",
"mousetrap": "1.4.6", "mousetrap": "1.4.6",
"zeroclipboard": "~1.3.5", "zeroclipboard": "~1.3.5",
"ng-idle": "*" "ng-idle": "*",
"underscore": "~1.7.0"
}, },
"resolutions": { "resolutions": {
"angular": "=1.2.19" "angular": "=1.2.19"

1
karma.conf.js
View File

@ -29,6 +29,7 @@ module.exports = function(config) {
'lib/angular-foundation/mm-foundation.min.js', 'lib/angular-foundation/mm-foundation.min.js',
'lib/angular-foundation/mm-foundation-tpls.min.js', 'lib/angular-foundation/mm-foundation-tpls.min.js',
'lib/bitcore.js', 'lib/bitcore.js',
'lib/underscore/underscore.js',
'lib/crypto-js/rollups/sha256.js', 'lib/crypto-js/rollups/sha256.js',
'lib/crypto-js/rollups/pbkdf2.js', 'lib/crypto-js/rollups/pbkdf2.js',
'lib/crypto-js/rollups/aes.js', 'lib/crypto-js/rollups/aes.js',

3
package.json
View File

@ -17,7 +17,8 @@
"optimist": "^0.6.1", "optimist": "^0.6.1",
"preconditions": "^1.0.7", "preconditions": "^1.0.7",
"request": "^2.40.0", "request": "^2.40.0",
"sinon": "1.9.1" "sinon": "1.9.1",
"underscore": "^1.7.0"
}, },
"scripts": { "scripts": {
"shell": "node shell/scripts/launch.js", "shell": "node shell/scripts/launch.js",

3
util/build.js
View File

@ -43,6 +43,9 @@ var createBundle = function(opts) {
b.require('browser-request', { b.require('browser-request', {
expose: 'request' expose: 'request'
}); });
b.require('underscore', {
expose: 'underscore'
});
b.require('./copay', { b.require('./copay', {
expose: 'copay' expose: 'copay'