add WalletLock class

This commit is contained in:
Matias Alejo Garcia 2014-08-14 18:25:53 -04:00
commit d8e0d50dce
4 changed files with 151 additions and 3 deletions

View file

@ -38,12 +38,40 @@ var createBundle = function(opts) {
expose: '../js/models/core/WalletFactory'
});
b.require('./js/models/core/Wallet');
b.require('./js/models/core/Wallet', {
expose: '../js/models/core/Wallet'
});
b.require('./js/models/core/Wallet', {
expose: '../../js/models/core/Wallet'
});
<<<<<<< HEAD
=======
b.require('./js/models/core/WalletLock', {
expose: '../js/models/core/WalletLock'
});
b.require('./test/mocks/FakeStorage', {
expose: './mocks/FakeStorage'
});
b.require('./test/mocks/FakeLocalStorage', {
expose: './mocks/FakeLocalStorage'
});
b.require('./js/models/core/Message', {
expose: '../js/models/core/Message'
});
b.require('./test/mocks/FakeBlockchain', {
expose: './mocks/FakeBlockchain'
});
b.require('./test/mocks/FakeNetwork', {
expose: './mocks/FakeNetwork'
});
b.require('./test/mocks/FakePayProServer', {
expose: './mocks/FakePayProServer'
});
b.require('./test/mocks/FakePayProServer', {
expose: '../../mocks/FakePayProServer'
});
b.require('./test/mocks/FakeBuilder', {
expose: './mocks/FakeBuilder'
});
>>>>>>> add WalletLock class
b.require('./js/models/network/WebRTC', {
expose: '../js/models/network/WebRTC'
});