#73 Mismatched anonymous define() module because of #57

devote · May 22, 2015 · c211663 · c211663
1 parent dd55b4c
commit c211663
Show file tree

Hide file tree

Showing 8 changed files with 77 additions and 55 deletions.
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ npm install html5-history-api
 ### Browser Support:
 
 `history.js` - IE8+ and other browsers
+
 `history.ielte7.js` - IE6+ and other browsers
 
 ### For library developers:
@@ -218,6 +219,7 @@ npm install html5-history-api
 ### Поддержка браузеров:
 
 `history.js` - IE8+ и другие браузеры
+
 `history.ielte7.js` - IE6+ и другие браузеры
 
 ### Для разработчиков библиотек:

diff --git a/bower.json b/bower.json
@@ -2,7 +2,7 @@
   "name": "history",
   "repo": "devote/HTML5-History-API",
   "description": "HTML5 History API expansion for browsers not supporting pushState, replaceState",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "keywords": ["history", "pushState", "replaceState"],
   "main": "history.js",
   "scripts": ["history.js"],

diff --git a/component.json b/component.json
@@ -1,6 +1,6 @@
 {
   "name": "html5-history-api",
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "HTML5 History API expansion for browsers not supporting pushState, replaceState",
   "main": "history.js",
   "scripts": ["history.js"],

diff --git a/history.ielte7.js b/history.ielte7.js
@@ -1,25 +1,35 @@
 /*!
- * History API JavaScript Library v4.2.0
+ * History API JavaScript Library v4.2.1
  *
  * Support: IE6+, FF3+, Opera 9+, Safari, Chrome and other
  *
- * Copyright 2011-2014, Dmitrii Pakhtinov ( spb.piksel@gmail.com )
+ * Copyright 2011-2015, Dmitrii Pakhtinov ( spb.piksel@gmail.com )
  *
  * http://spb-piksel.ru/
  *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  *
- * Update: 2014-11-06 21:35
+ * Update: 2015-05-22 13:02
  */
 (function(factory) {
     if (typeof define === 'function' && define['amd']) {
-        // https://github.com/devote/HTML5-History-API/issues/57#issuecomment-43133600
-        define(typeof document !== "object" || document.readyState !== "loading" ? [] : "html5-history-api", factory);
-    } else {
-        factory();
+        // https://github.com/devote/HTML5-History-API/issues/73
+        var rndKey = '[history' + (new Date()).getTime() + ']';
+        var onError = requirejs['onError'];
+        factory.toString = function() {
+          return rndKey;
+        };
+        requirejs['onError'] = function(err) {
+          if (err.message.indexOf(rndKey) === -1) {
+            onError.call(requirejs, err);
+          }
+        };
+        define([], factory);
     }
+    // execute anyway
+    factory();
 })(function() {
     // Define global variable
     var global = (typeof window === 'object' ? window : this) || {};

diff --git a/history.ielte7.min.js b/history.ielte7.min.js
diff --git a/history.js b/history.js
@@ -1,25 +1,35 @@
 /*!
- * History API JavaScript Library v4.2.0
+ * History API JavaScript Library v4.2.1
  *
  * Support: IE8+, FF3+, Opera 9+, Safari, Chrome and other
  *
- * Copyright 2011-2014, Dmitrii Pakhtinov ( spb.piksel@gmail.com )
+ * Copyright 2011-2015, Dmitrii Pakhtinov ( spb.piksel@gmail.com )
  *
  * http://spb-piksel.ru/
  *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  *
- * Update: 2014-11-06 21:35
+ * Update: 2015-05-22 13:02
  */
 (function(factory) {
     if (typeof define === 'function' && define['amd']) {
-        // https://github.com/devote/HTML5-History-API/issues/57#issuecomment-43133600
-        define(typeof document !== "object" || document.readyState !== "loading" ? [] : "html5-history-api", factory);
-    } else {
-        factory();
+        // https://github.com/devote/HTML5-History-API/issues/73
+        var rndKey = '[history' + (new Date()).getTime() + ']';
+        var onError = requirejs['onError'];
+        factory.toString = function() {
+          return rndKey;
+        };
+        requirejs['onError'] = function(err) {
+          if (err.message.indexOf(rndKey) === -1) {
+            onError.call(requirejs, err);
+          }
+        };
+        define([], factory);
     }
+    // execute anyway
+    factory();
 })(function() {
     // Define global variable
     var global = (typeof window === 'object' ? window : this) || {};

diff --git a/history.min.js b/history.min.js
diff --git a/package.json b/package.json
@@ -7,7 +7,7 @@
       "*.js"
     ]
   }],
-  "version": "4.2.0",
+  "version": "4.2.1",
   "description": "HTML5 History API expansion for browsers not supporting pushState, replaceState",
   "main": "history.js",
   "repository": {