From e7beb9f012f87762fe9823585e97cc99367dd03b Mon Sep 17 00:00:00 2001 From: "Chen, Yi-Cyuan" Date: Wed, 8 Feb 2017 09:57:33 +0800 Subject: [PATCH] Fixed `root` is undefined in some special environment. --- .covignore | 2 +- .gitignore | 4 +- .npmignore | 4 -- .travis.yml | 11 +++--- CHANGELOG.md | 42 ++++++++++++-------- LICENSE.txt | 2 +- README.md | 54 ++++---------------------- bower.json | 2 +- build/md2.min.js | 20 ++++------ package.json | 12 ++++-- src/md2.js | 92 +++++++++++++++++++++++--------------------- tests/node-test.js | 37 +++++++++++++++--- tests/requirejs.html | 4 +- tests/test.js | 22 +++++------ 14 files changed, 154 insertions(+), 154 deletions(-) delete mode 100644 .npmignore diff --git a/.covignore b/.covignore index 8c36f6f..c5e2446 100644 --- a/.covignore +++ b/.covignore @@ -1,2 +1,2 @@ +/node_modules/ /tests/ -node_modules/ diff --git a/.gitignore b/.gitignore index 3eeddb7..856f74c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -node_modules -my_test +/node_modules/ +/covreporter/ diff --git a/.npmignore b/.npmignore deleted file mode 100644 index d69ed3a..0000000 --- a/.npmignore +++ /dev/null @@ -1,4 +0,0 @@ -my_test -covreporter -build -tests diff --git a/.travis.yml b/.travis.yml index aabe614..4036a6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,11 @@ language: node_js node_js: - - "0.11" - - "0.10" - - "0.8" + - "0.12.15" + - "4.5" + - "6.5.0" before_install: - - npm install mocha -g - - npm install coveralls -g - - npm install mocha-lcov-reporter -g + - npm install coveralls + - npm install mocha-lcov-reporter script: npm run-script coveralls branches: only: diff --git a/CHANGELOG.md b/CHANGELOG.md index 39cfe31..f3e5fc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,24 +1,36 @@ -# v0.2.1 / 2015-04-03 +# Change Log -* Support AMD. +## v0.2.2 / 2017-02-08 +### Fixed +- `root` is undefined in some special environment. -# v0.2.0 / 2015-02-28 +## v0.2.1 / 2015-04-03 +### Added +- support AMD. -* Remove ascii parameter. -* Improve performance. -* Add test case. +## v0.2.0 / 2015-02-28 +### Added +- test cases. -# v0.1.2 / 2015-01-07 +### Removed +- ascii parameter. -* Add bower package. -* Fixed JSHint warnings. -* Add travis. -* Add coveralls. +### Improved +- performance. -# v0.1.1 / 2014-07-27 +## v0.1.2 / 2015-01-07 +### Added +- bower package. +- travis. +- coveralls. -Fixed accents bug +### Fixed +- JSHint warnings. -# v0.1.0 / 2014-01-05 +## v0.1.1 / 2014-07-27 +### Fixed +- accents bug -Initial release +## v0.1.0 / 2014-01-05 +### Added +- initial release. diff --git a/LICENSE.txt b/LICENSE.txt index 58074d3..74ac20d 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -Copyright 2014-2015 emn178@gmail.com +Copyright 2014-2017 Chen, Yi-Cyuan Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the diff --git a/README.md b/README.md index cada568..142f314 100644 --- a/README.md +++ b/README.md @@ -27,66 +27,28 @@ md2('Message to hash'); ``` If you use node.js, you should require the module first: ```JavaScript -md2 = require('js-md2'); +var md2 = require('js-md2'); ``` If you use require.js, you should require the module first: ```JavaScript -require(['md2.js'], function(md2) { +require(['md2.js'], function (md2) { // ... }); ``` ## Example -Code ```JavaScript -md2(''); -md2('The quick brown fox jumps over the lazy dog'); -md2('The quick brown fox jumps over the lazy dog.'); -``` -Output - - 8350e5a3e24c153df2275c9f80692773 - 03d85a0d629d2c442e987525319fc471 - 71eaa7e440b611e41a6f0d97384b342a +md2(''); // 8350e5a3e24c153df2275c9f80692773 +md2('The quick brown fox jumps over the lazy dog'); // 03d85a0d629d2c442e987525319fc471 +md2('The quick brown fox jumps over the lazy dog.'); // 71eaa7e440b611e41a6f0d97384b342a -It also supports UTF-8 encoding: - -Code -```JavaScript -md2('中文'); +// It also supports UTF-8 encoding +md2('中文'); // 7af93c270b0ec392ca2f0d90a927cf8a ``` -Output - 7af93c270b0ec392ca2f0d90a927cf8a - -## Extensions -### jQuery -If you prefer jQuery style, you can add following code to add a jQuery extension. - -Code -```JavaScript -jQuery.md2 = md2 -``` -And then you could use like this: -```JavaScript -$.md2('message'); -``` -### Prototype -If you prefer prototype style, you can add following code to add a prototype extension. - -Code -```JavaScript -String.prototype.md2 = function() { - return md2(this); -}; -``` -And then you could use like this: -```JavaScript -'message'.md2(); -``` ## License The project is released under the [MIT license](http://www.opensource.org/licenses/MIT). ## Contact The project's website is located at https://github.com/emn178/js-md2 -Author: emn178@gmail.com +Author: Chen, Yi-Cyuan (emn178@gmail.com) diff --git a/bower.json b/bower.json index 99276b0..2164eff 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "js-md2", - "version": "0.2.1", + "version": "0.2.2", "main": ["src/md2.js"], "ignore": [ "samples", diff --git a/build/md2.min.js b/build/md2.min.js index 073eeb7..ef7a96a 100644 --- a/build/md2.min.js +++ b/build/md2.min.js @@ -1,14 +1,10 @@ -/* - * js-md5 v0.2.1 - * https://github.com/emn178/js-md2 +/** + * [js-md2]{@link https://github.com/emn178/js-md2} * - * Copyright 2014-2015, emn178@gmail.com - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT + * @namespace md2 + * @version 0.2.2 + * @author Chen, Yi-Cyuan [emn178@gmail.com] + * @copyright Chen, Yi-Cyuan 2014-2017 + * @license MIT */ -(function(h,v){"object"==typeof process&&process.versions&&process.versions.node&&(h=global);var u="function"==typeof define&&define.amd,q="0123456789abcdef".split(""),r=[41,46,67,201,162,216,124,1,61,54,84,161,236,240,6,19,98,167,5,243,192,199,115,140,152,147,43,217,188,76,130,202,30,155,87,60,253,212,224,22,103,66,111,24,138,23,229,18,190,78,196,214,218,158,222,73,160,251,245,142,187,47,238,122,169,104,121,145,21,178,7,63,148,194,16,137,11,34,95,33,128,127,93,154,90,144,50,39,53,62,204,231,191, -247,151,3,255,25,48,179,72,165,181,209,215,94,146,42,172,86,170,198,79,184,56,210,150,164,125,182,118,252,107,226,156,116,4,241,69,157,112,89,100,113,135,32,134,91,207,101,230,45,168,2,27,96,37,173,174,176,185,246,28,70,97,105,52,64,126,15,85,71,163,35,221,81,175,58,195,92,249,206,186,197,234,38,44,83,13,110,133,40,132,9,211,223,205,244,65,129,77,82,106,220,55,200,108,193,171,250,36,225,123,8,12,189,177,74,120,136,149,139,227,99,232,109,233,203,213,254,59,0,29,57,242,239,183,14,102,88,208,228,166, -119,114,248,235,117,75,10,49,68,80,180,143,237,31,26,219,153,141,51,159,17,131,20],c=[],a=[],k=[],g=function(e){var d,b,l,f,h=0,g=1,m=0,n=0,p=0,t=e.length;for(b=0;16>b;++b)a[b]=k[b]=0;c[16]=c[17]=c[18]=0;do{c[0]=c[16];c[1]=c[17];c[2]=c[18];c[16]=c[17]=c[18]=c[3]=c[4]=c[5]=c[6]=c[7]=c[8]=c[9]=c[10]=c[11]=c[12]=c[13]=c[14]=c[15]=0;for(b=n;mb;++m)d=e.charCodeAt(m),128>d?c[b++]=d:(2048>d?c[b++]=192|d>>6:(55296>d||57344<=d?c[b++]=224|d>>12:(d=65536+((d&1023)<<10|e.charCodeAt(++m)&1023),c[b++]=240| -d>>18,c[b++]=128|d>>12&63),c[b++]=128|d>>6&63),c[b++]=128|d&63);p+=b-n;n=b-16;if(m==t&&16>b)for(g=2,f=16-(p&15);16>b;++b)c[b]=f;for(b=0;16>b;++b)k[b]^=r[c[b]^h],h=k[b];for(b=0;bd;++d){for(l=0;48>l;++l)a[l]=f=a[l]^r[f];f=f+d&255}}while(1==g);e="";for(b=0;16>b;++b)e+=q[a[b]>>4&15]+q[a[b]&15];return e};!h.JS_MD2_TEST&&"object"==typeof module&&module.exports?module.exports=g:(u&&define(function(){return g}),h.md2=g)})(this); +!function(){"use strict";var o="object"==typeof window?window:{},e=!o.JS_MD2_NO_NODE_JS&&"object"==typeof process&&process.versions&&process.versions.node;e&&(o=global);var r=!o.JS_MD2_NO_COMMON_JS&&"object"==typeof module&&module.exports,f="function"==typeof define&&define.amd,t="0123456789abcdef".split(""),n=[41,46,67,201,162,216,124,1,61,54,84,161,236,240,6,19,98,167,5,243,192,199,115,140,152,147,43,217,188,76,130,202,30,155,87,60,253,212,224,22,103,66,111,24,138,23,229,18,190,78,196,214,218,158,222,73,160,251,245,142,187,47,238,122,169,104,121,145,21,178,7,63,148,194,16,137,11,34,95,33,128,127,93,154,90,144,50,39,53,62,204,231,191,247,151,3,255,25,48,179,72,165,181,209,215,94,146,42,172,86,170,198,79,184,56,210,150,164,125,182,118,252,107,226,156,116,4,241,69,157,112,89,100,113,135,32,134,91,207,101,230,45,168,2,27,96,37,173,174,176,185,246,28,70,97,105,52,64,126,15,85,71,163,35,221,81,175,58,195,92,249,206,186,197,234,38,44,83,13,110,133,40,132,9,211,223,205,244,65,129,77,82,106,220,55,200,108,193,171,250,36,225,123,8,12,189,177,74,120,136,149,139,227,99,232,109,233,203,213,254,59,0,29,57,242,239,183,14,102,88,208,228,166,119,114,248,235,117,75,10,49,68,80,180,143,237,31,26,219,153,141,51,159,17,131,20],d=[],i=[],s=[],c=function(o){var e,r,f,c,p,u,a=0,l=1,_=0,v=0,b=0,m=o.length;for(r=0;16>r;++r)i[r]=s[r]=0;d[16]=d[17]=d[18]=0;do{for(d[0]=d[16],d[1]=d[17],d[2]=d[18],d[16]=d[17]=d[18]=d[3]=d[4]=d[5]=d[6]=d[7]=d[8]=d[9]=d[10]=d[11]=d[12]=d[13]=d[14]=d[15]=0,r=v;m>_&&16>r;++_)e=o.charCodeAt(_),128>e?d[r++]=e:2048>e?(d[r++]=192|e>>6,d[r++]=128|63&e):55296>e||e>=57344?(d[r++]=224|e>>12,d[r++]=128|e>>6&63,d[r++]=128|63&e):(e=65536+((1023&e)<<10|1023&o.charCodeAt(++_)),d[r++]=240|e>>18,d[r++]=128|e>>12&63,d[r++]=128|e>>6&63,d[r++]=128|63&e);if(b+=r-v,v=r-16,_===m&&16>r)for(l=2,p=16-(15&b);16>r;++r)d[r]=p;for(r=0;16>r;++r)s[r]^=n[d[r]^a],a=s[r];for(r=0;l>r;++r)for(u=0===r?d:s,i[16]=u[0],i[32]=i[16]^i[0],i[17]=u[1],i[33]=i[17]^i[1],i[18]=u[2],i[34]=i[18]^i[2],i[19]=u[3],i[35]=i[19]^i[3],i[20]=u[4],i[36]=i[20]^i[4],i[21]=u[5],i[37]=i[21]^i[5],i[22]=u[6],i[38]=i[22]^i[6],i[23]=u[7],i[39]=i[23]^i[7],i[24]=u[8],i[40]=i[24]^i[8],i[25]=u[9],i[41]=i[25]^i[9],i[26]=u[10],i[42]=i[26]^i[10],i[27]=u[11],i[43]=i[27]^i[11],i[28]=u[12],i[44]=i[28]^i[12],i[29]=u[13],i[45]=i[29]^i[13],i[30]=u[14],i[46]=i[30]^i[14],i[31]=u[15],i[47]=i[31]^i[15],p=0,f=0;18>f;++f){for(c=0;48>c;++c)i[c]=p=i[c]^n[p];p=p+f&255}}while(1===l);var w="";for(r=0;16>r;++r)w+=t[i[r]>>4&15]+t[15&i[r]];return w};r?module.exports=c:(o.md2=c,f&&define(function(){return c}))}(); \ No newline at end of file diff --git a/package.json b/package.json index 47ffc61..08b211f 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,19 @@ { "name": "js-md2", - "version": "0.2.1", + "version": "0.2.2", "description": "A simple MD2 hash function for JavaScript supports UTF-8 encoding.", "main": "src/md2.js", "devDependencies": { "expect.js": "~0.3.1", - "jscoverage": "~0.5.9" + "jscoverage": "~0.5.9", + "mocha": "~2.3.4", + "uglifyjs": "~2.4.10" }, "scripts": { "test": "mocha tests/node-test.js -r jscoverage", - "coveralls": "mocha tests/node-test.js -R mocha-lcov-reporter -r jscoverage | coveralls" + "report": "mocha tests/node-test.js -r jscoverage --covout=html", + "coveralls": "mocha tests/node-test.js -R mocha-lcov-reporter -r jscoverage | coveralls", + "build": "uglifyjs src/md2.js --compress --mangle --comments --output build/md2.min.js" }, "repository": { "type": "git", @@ -23,7 +27,7 @@ "HMAC" ], "license": "MIT", - "author": "emn178 ", + "author": "Chen, Yi-Cyuan ", "homepage": "https://github.com/emn178/js-md2", "bugs": { "url": "https://github.com/emn178/js-md2/issues" diff --git a/src/md2.js b/src/md2.js index 28c0c0a..7335726 100644 --- a/src/md2.js +++ b/src/md2.js @@ -1,47 +1,51 @@ -/* - * js-md5 v0.2.1 - * https://github.com/emn178/js-md2 +/** + * [js-md2]{@link https://github.com/emn178/js-md2} * - * Copyright 2014-2015, emn178@gmail.com - * - * Licensed under the MIT license: - * http://www.opensource.org/licenses/MIT + * @namespace md2 + * @version 0.2.2 + * @author Chen, Yi-Cyuan [emn178@gmail.com] + * @copyright Chen, Yi-Cyuan 2014-2017 + * @license MIT */ -;(function(root, undefined) { +/*jslint bitwise: true */ +(function () { 'use strict'; - var NODE_JS = typeof process == 'object' && process.versions && process.versions.node; - if(NODE_JS) { + var root = typeof window === 'object' ? window : {}; + var NODE_JS = !root.JS_MD2_NO_NODE_JS && typeof process === 'object' && process.versions && process.versions.node; + if (NODE_JS) { root = global; } - var COMMON_JS = !root.JS_MD2_TEST && typeof module == 'object' && module.exports; - var AMD = typeof define == 'function' && define.amd; + var COMMON_JS = !root.JS_MD2_NO_COMMON_JS && typeof module === 'object' && module.exports; + var AMD = typeof define === 'function' && define.amd; var HEX_CHARS = '0123456789abcdef'.split(''); - var S = [ 0x29, 0x2E, 0x43, 0xC9, 0xA2, 0xD8, 0x7C, 0x01, 0x3D, 0x36, 0x54, 0xA1, 0xEC, 0xF0, 0x06, 0x13, - 0x62, 0xA7, 0x05, 0xF3, 0xC0, 0xC7, 0x73, 0x8C, 0x98, 0x93, 0x2B, 0xD9, 0xBC, 0x4C, 0x82, 0xCA, - 0x1E, 0x9B, 0x57, 0x3C, 0xFD, 0xD4, 0xE0, 0x16, 0x67, 0x42, 0x6F, 0x18, 0x8A, 0x17, 0xE5, 0x12, - 0xBE, 0x4E, 0xC4, 0xD6, 0xDA, 0x9E, 0xDE, 0x49, 0xA0, 0xFB, 0xF5, 0x8E, 0xBB, 0x2F, 0xEE, 0x7A, - 0xA9, 0x68, 0x79, 0x91, 0x15, 0xB2, 0x07, 0x3F, 0x94, 0xC2, 0x10, 0x89, 0x0B, 0x22, 0x5F, 0x21, - 0x80, 0x7F, 0x5D, 0x9A, 0x5A, 0x90, 0x32, 0x27, 0x35, 0x3E, 0xCC, 0xE7, 0xBF, 0xF7, 0x97, 0x03, - 0xFF, 0x19, 0x30, 0xB3, 0x48, 0xA5, 0xB5, 0xD1, 0xD7, 0x5E, 0x92, 0x2A, 0xAC, 0x56, 0xAA, 0xC6, - 0x4F, 0xB8, 0x38, 0xD2, 0x96, 0xA4, 0x7D, 0xB6, 0x76, 0xFC, 0x6B, 0xE2, 0x9C, 0x74, 0x04, 0xF1, - 0x45, 0x9D, 0x70, 0x59, 0x64, 0x71, 0x87, 0x20, 0x86, 0x5B, 0xCF, 0x65, 0xE6, 0x2D, 0xA8, 0x02, - 0x1B, 0x60, 0x25, 0xAD, 0xAE, 0xB0, 0xB9, 0xF6, 0x1C, 0x46, 0x61, 0x69, 0x34, 0x40, 0x7E, 0x0F, - 0x55, 0x47, 0xA3, 0x23, 0xDD, 0x51, 0xAF, 0x3A, 0xC3, 0x5C, 0xF9, 0xCE, 0xBA, 0xC5, 0xEA, 0x26, - 0x2C, 0x53, 0x0D, 0x6E, 0x85, 0x28, 0x84, 0x09, 0xD3, 0xDF, 0xCD, 0xF4, 0x41, 0x81, 0x4D, 0x52, - 0x6A, 0xDC, 0x37, 0xC8, 0x6C, 0xC1, 0xAB, 0xFA, 0x24, 0xE1, 0x7B, 0x08, 0x0C, 0xBD, 0xB1, 0x4A, - 0x78, 0x88, 0x95, 0x8B, 0xE3, 0x63, 0xE8, 0x6D, 0xE9, 0xCB, 0xD5, 0xFE, 0x3B, 0x00, 0x1D, 0x39, - 0xF2, 0xEF, 0xB7, 0x0E, 0x66, 0x58, 0xD0, 0xE4, 0xA6, 0x77, 0x72, 0xF8, 0xEB, 0x75, 0x4B, 0x0A, - 0x31, 0x44, 0x50, 0xB4, 0x8F, 0xED, 0x1F, 0x1A, 0xDB, 0x99, 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14]; + var S = [ + 0x29, 0x2E, 0x43, 0xC9, 0xA2, 0xD8, 0x7C, 0x01, 0x3D, 0x36, 0x54, 0xA1, 0xEC, 0xF0, 0x06, 0x13, + 0x62, 0xA7, 0x05, 0xF3, 0xC0, 0xC7, 0x73, 0x8C, 0x98, 0x93, 0x2B, 0xD9, 0xBC, 0x4C, 0x82, 0xCA, + 0x1E, 0x9B, 0x57, 0x3C, 0xFD, 0xD4, 0xE0, 0x16, 0x67, 0x42, 0x6F, 0x18, 0x8A, 0x17, 0xE5, 0x12, + 0xBE, 0x4E, 0xC4, 0xD6, 0xDA, 0x9E, 0xDE, 0x49, 0xA0, 0xFB, 0xF5, 0x8E, 0xBB, 0x2F, 0xEE, 0x7A, + 0xA9, 0x68, 0x79, 0x91, 0x15, 0xB2, 0x07, 0x3F, 0x94, 0xC2, 0x10, 0x89, 0x0B, 0x22, 0x5F, 0x21, + 0x80, 0x7F, 0x5D, 0x9A, 0x5A, 0x90, 0x32, 0x27, 0x35, 0x3E, 0xCC, 0xE7, 0xBF, 0xF7, 0x97, 0x03, + 0xFF, 0x19, 0x30, 0xB3, 0x48, 0xA5, 0xB5, 0xD1, 0xD7, 0x5E, 0x92, 0x2A, 0xAC, 0x56, 0xAA, 0xC6, + 0x4F, 0xB8, 0x38, 0xD2, 0x96, 0xA4, 0x7D, 0xB6, 0x76, 0xFC, 0x6B, 0xE2, 0x9C, 0x74, 0x04, 0xF1, + 0x45, 0x9D, 0x70, 0x59, 0x64, 0x71, 0x87, 0x20, 0x86, 0x5B, 0xCF, 0x65, 0xE6, 0x2D, 0xA8, 0x02, + 0x1B, 0x60, 0x25, 0xAD, 0xAE, 0xB0, 0xB9, 0xF6, 0x1C, 0x46, 0x61, 0x69, 0x34, 0x40, 0x7E, 0x0F, + 0x55, 0x47, 0xA3, 0x23, 0xDD, 0x51, 0xAF, 0x3A, 0xC3, 0x5C, 0xF9, 0xCE, 0xBA, 0xC5, 0xEA, 0x26, + 0x2C, 0x53, 0x0D, 0x6E, 0x85, 0x28, 0x84, 0x09, 0xD3, 0xDF, 0xCD, 0xF4, 0x41, 0x81, 0x4D, 0x52, + 0x6A, 0xDC, 0x37, 0xC8, 0x6C, 0xC1, 0xAB, 0xFA, 0x24, 0xE1, 0x7B, 0x08, 0x0C, 0xBD, 0xB1, 0x4A, + 0x78, 0x88, 0x95, 0x8B, 0xE3, 0x63, 0xE8, 0x6D, 0xE9, 0xCB, 0xD5, 0xFE, 0x3B, 0x00, 0x1D, 0x39, + 0xF2, 0xEF, 0xB7, 0x0E, 0x66, 0x58, 0xD0, 0xE4, 0xA6, 0x77, 0x72, 0xF8, 0xEB, 0x75, 0x4B, 0x0A, + 0x31, 0x44, 0x50, 0xB4, 0x8F, 0xED, 0x1F, 0x1A, 0xDB, 0x99, 0x8D, 0x33, 0x9F, 0x11, 0x83, 0x14 + ]; var M = [], X = [], C = []; - var md2 = function(message) { + var md2 = function (message) { var code, i, j, k, t, L = 0, loop = 1, B, - index = 0, start = 0, bytes = 0, length = message.length; + index = 0, start = 0, bytes = 0, length = message.length; - for(i = 0;i < 16;++i) { + for (i = 0; i < 16; ++i) { X[i] = C[i] = 0; } @@ -54,7 +58,7 @@ M[4] = M[5] = M[6] = M[7] = M[8] = M[9] = M[10] = M[11] = M[12] = M[13] = M[14] = M[15] = 0; - for (i = start;index < length && i < 16; ++index) { + for (i = start; index < length && i < 16; ++index) { code = message.charCodeAt(index); if (code < 0x80) { M[i++] = code; @@ -76,20 +80,20 @@ bytes += i - start; start = i - 16; - if(index == length && i < 16) { + if (index === length && i < 16) { loop = 2; t = 16 - (bytes & 15); - for(;i < 16;++i) { + for (; i < 16; ++i) { M[i] = t; } } - for(i = 0;i < 16;++i) { + for (i = 0; i < 16; ++i) { C[i] ^= S[M[i] ^ L]; L = C[i]; } - for(i = 0;i < loop;++i) { + for (i = 0; i < loop; ++i) { B = i === 0 ? M : C; X[16] = B[0]; @@ -126,30 +130,30 @@ X[47] = X[31] ^ X[15]; t = 0; - for(j = 0;j < 18;++j) { - for(k = 0;k < 48;++k) { + for (j = 0; j < 18; ++j) { + for (k = 0; k < 48; ++k) { X[k] = t = X[k] ^ S[t]; } t = (t + j) & 0xFF; } } - } while(loop == 1); + } while (loop === 1); var hex = ''; - for(i = 0;i < 16;++i) { + for (i = 0; i < 16; ++i) { hex += HEX_CHARS[(X[i] >> 4) & 0x0F] + HEX_CHARS[X[i] & 0x0F]; } return hex; }; - if(COMMON_JS) { + if (COMMON_JS) { module.exports = md2; } else { - if(AMD) { + root.md2 = md2; + if (AMD) { define(function() { return md2; }); } - root.md2 = md2; } -}(this)); +})(); diff --git a/tests/node-test.js b/tests/node-test.js index 65035cc..4ff3659 100644 --- a/tests/node-test.js +++ b/tests/node-test.js @@ -1,23 +1,50 @@ -md2 = require('../src/md2.js'); +// Node.js env expect = require('expect.js'); +md2 = require('../src/md2.js'); require('./test.js'); delete require.cache[require.resolve('../src/md2.js')] delete require.cache[require.resolve('./test.js')] md2 = null -JS_MD2_TEST = true; -require('../src/md2.js'); +// Webpack browser env +JS_MD2_NO_NODE_JS = true; +window = global; +md2 = require('../src/md2.js'); require('./test.js'); delete require.cache[require.resolve('../src/md2.js')] delete require.cache[require.resolve('./test.js')] md2 = null -define = function(func) { +// browser env +JS_MD2_NO_NODE_JS = true; +JS_MD2_NO_COMMON_JS = true; +window = global; +require('../src/md2.js'); +require('./test.js'); + +delete require.cache[require.resolve('../src/md2.js')]; +delete require.cache[require.resolve('./test.js')]; +md2 = null; + +// browser AMD +JS_MD2_NO_NODE_JS = true; +JS_MD2_NO_COMMON_JS = true; +window = global; +define = function (func) { md2 = func(); + require('./test.js'); }; define.amd = true; require('../src/md2.js'); -require('./test.js'); + + +// define = function(func) { +// md2 = func(); +// }; +// define.amd = true; + +// require('../src/md2.js'); +// require('./test.js'); diff --git a/tests/requirejs.html b/tests/requirejs.html index dd721e3..d46c9d9 100644 --- a/tests/requirejs.html +++ b/tests/requirejs.html @@ -12,9 +12,9 @@