Merge branch 'release/3.1.7'

suning4583 · Oct 7, 2016 · 67d2e99 · 67d2e99
2 parents 6362ada + 950833e
commit 67d2e99
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -68,7 +68,7 @@ Including all libraries, for access to extra methods:
 // Above-mentioned will work or use this simple form
 require.config({
     paths: {
-        'require-js': 'path-to/bower_components/crypto-js/crypto-js'
+        'crypto-js': 'path-to/bower_components/crypto-js/crypto-js'
     }
 });
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "crypto-js",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "JavaScript library of crypto standards.",
   "license": "MIT",
   "homepage": "http://github.com/brix/crypto-js",

diff --git a/core.js b/core.js
@@ -63,7 +63,7 @@
 	                }
 
 	                // Create default initializer
-	                if (!subtype.hasOwnProperty('init')) {
+	                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
 	                    subtype.init = function () {
 	                        subtype.$super.init.apply(this, arguments);
 	                    };

diff --git a/crypto-js.js b/crypto-js.js
@@ -63,7 +63,7 @@
 	                }
 
 	                // Create default initializer
-	                if (!subtype.hasOwnProperty('init')) {
+	                if (!subtype.hasOwnProperty('init') || this.init === subtype.init) {
 	                    subtype.init = function () {
 	                        subtype.$super.init.apply(this, arguments);
 	                    };

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "crypto-js",
-  "version": "3.1.6",
+  "version": "3.1.7",
   "description": "JavaScript library of crypto standards.",
   "license": "MIT",
   "author": {