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

Merge remote-tracking branch 'maraoz/feature/bundle-name' 

Conflicts:
	browser/bitcore-0.1.24.js
This commit is contained in:
Ryan X. Charles 2014-07-07 19:00:26 -07:00
parent 5cdc160dea 9ac8682fb0
commit 4e3b258f07
5 changed files with 160 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

278
browser/bundle.js → browser/bitcore-0.1.24.js
View File

File diff suppressed because one or more lines are too long

1
browser/bitcore-latest.js Symbolic link
View File

@ -0,0 +1 @@
bitcore-0.1.24.js

5
browser/build.js
View File

@ -181,7 +181,10 @@ if (require.main === module) {
testBundle.pipe(fs.createWriteStream('browser/testdata.js'));
}
var bitcoreBundle = createBitcore(program);
bitcoreBundle.pipe(program.stdout ? process.stdout : fs.createWriteStream('browser/bundle.js'));
var pjson = require('../package.json');
bitcoreBundle.pipe(
program.stdout ? process.stdout :
fs.createWriteStream('browser/bitcore-'+pjson.version+'.js'));
}
module.exports.createBitcore = createBitcore;

7
browser/testdata.js
View File

@ -1174,6 +1174,7 @@ var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
? Uint8Array
: Array
var ZERO = '0'.charCodeAt(0)
var PLUS = '+'.charCodeAt(0)
var SLASH = '/'.charCodeAt(0)
var NUMBER = '0'.charCodeAt(0)
@ -1282,9 +1283,9 @@ var lookup = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
return output
}
exports.toByteArray = b64ToByteArray
exports.fromByteArray = uint8ToBase64
}(typeof exports === 'undefined' ? (this.base64js = {}) : exports))
module.exports.toByteArray = b64ToByteArray
module.exports.fromByteArray = uint8ToBase64
}())
},{}],4:[function(require,module,exports){
exports.read = function(buffer, offset, isLE, mLen, nBytes) {

2
test/index.html
View File

@ -11,7 +11,7 @@
<script src="../node_modules/mocha/mocha.js"></script>
<script src="../node_modules/chai/chai.js"></script>
<script>mocha.setup('bdd')</script>
<script src="../browser/bundle.js"></script>
<script src="../browser/bitcore-latest.js"></script>
<script src="../browser/testdata.js"></script>
<script src="adapter.js"></script>