Fixed root is undefined in some special environment.

emn178 · Feb 8, 2017 · e7beb9f · e7beb9f
1 parent d125d5a
commit e7beb9f
Show file tree

Hide file tree

Showing 14 changed files with 154 additions and 154 deletions.
diff --git a/.covignore b/.covignore
@@ -1,2 +1,2 @@
+/node_modules/
 /tests/
-node_modules/
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,2 @@
-node_modules
-my_test
+/node_modules/
+/covreporter/
diff --git a/.npmignore b/.npmignore
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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 <emn178@gmail.com>",
+  "author": "Chen, Yi-Cyuan <emn178@gmail.com>",
   "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
@@ -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));
+})();