From c211663c6dcfe1c1014bbe1b3bdf8098b1ff81fd Mon Sep 17 00:00:00 2001 From: Dmitrii Pakhtinov Date: Fri, 22 May 2015 13:44:23 +0300 Subject: [PATCH] #73 Mismatched anonymous define() module because of #57 --- README.md | 2 ++ bower.json | 2 +- component.json | 2 +- history.ielte7.js | 24 +++++++++++++++++------- history.ielte7.min.js | 42 +++++++++++++++++++++--------------------- history.js | 24 +++++++++++++++++------- history.min.js | 34 +++++++++++++++++----------------- package.json | 2 +- 8 files changed, 77 insertions(+), 55 deletions(-) diff --git a/README.md b/README.md index 26418fb..29341f6 100644 --- 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 index 0759b47..56edb55 100644 --- 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 index 6f3995f..310d48f 100644 --- 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 index aad33a3..436c0d8 100644 --- a/history.ielte7.js +++ b/history.ielte7.js @@ -1,9 +1,9 @@ /*! - * 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/ * @@ -11,15 +11,25 @@ * 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 index c971270..175fca6 100644 --- a/history.ielte7.min.js +++ b/history.ielte7.min.js @@ -1,9 +1,9 @@ /*! - * 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/ * @@ -11,25 +11,25 @@ * 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(Q){"function"===typeof define&&define.amd?define("object"!==typeof document||"loading"!==document.readyState?[]:"html5-history-api",Q):Q()})(function(){var j=!0,k=null,n=!1;function R(a,b){var c=d.history!==o;c&&(d.history=o);a.apply(o,b);c&&(d.history=l)}function J(){}function i(a,b,c){if(a!=k&&""!==a&&!b){var b=i(),e=g.getElementsByTagName("base")[0];!c&&e&&e.getAttribute("href")&&(e.href=e.href,b=i(e.href,k,j));c=b.e;e=b.h;a=""+a;a=/^(?:\w+\:)?\/\//.test(a)?0===a.indexOf("/")?e+a:a:e+"//"+b.g+(0===a.indexOf("/")?a:0===a.indexOf("?")?c+a:0===a.indexOf("#")?c+b.f+a:c.replace(/[^\/]+$/g,"")+a)}else if(a=b?a:f.href,!s||c)a=a.replace(/^[^#]*/,"")||"#",a=f.protocol.replace(/:.*$|$/, -":")+"//"+f.host+h.basepath+a.replace(RegExp("^#[/]?(?:"+h.type+")?"),"");S.href=a;var a=/(?:(\w+\:))?(?:\/\/(?:[^@]*@)?([^\/:\?#]+)(?::([0-9]+))?)?([^\?#]*)(?:(\?[^#]+)|\?)?(?:(#.*))?/.exec(S.href),b=a[2]+(a[3]?":"+a[3]:""),c=a[4]||"/",e=a[5]||"",d="#"===a[6]?"":a[6]||"",p=c+e+d,w=c.replace(RegExp("^"+h.basepath,"i"),h.type)+e;return{a:a[1]+"//"+b+p,h:a[1],g:b,i:a[2],k:a[3]||"",e:c,f:e,b:d,c:p,j:w,d:w+d}}function ba(){var a;try{a=d.sessionStorage,a.setItem(E+"t","1"),a.removeItem(E+"t")}catch(b){a= -{getItem:function(a){a=g.cookie.split(a+"=");return 1lfirst=1;parent.location.hash="'+b.d.replace(/"/g,'\\"')+'";<\/script>'),g.close();!d&&a&&(q[f.href]=a)}};y=function(b,c, -f,g){e.apply(this,arguments)||(b===r?r[c]=f:b===l?(l[c]=f,"state"===c&&(r=a(r),d.history=l=a(l),d.execScript("var history = window.history;","JavaScript"))):b[c]=f.get&&f.get());return b};setInterval(function(){var a=i().a;if(a!=h){var b=g.createEventObject();b.oldURL=h;b.newURL=h=a;b.type="hashchange";N(b)}},100);d.JSON=t}}var d=("object"===typeof window?window:this)||{};if(!d.history||"emulate"in d.history)return d.history;var g=d.document,I=g.documentElement,F=d.Object,t=d.JSON,f=d.location,o= -d.history,l=o,O=o.pushState,Y=o.replaceState,s=!!O,H="state"in o,C=F.defineProperty,r=y({},"t")?{}:g.createElement("a"),x="",P=d.addEventListener?"addEventListener":(x="on")&&"attachEvent",Z=d.removeEventListener?"removeEventListener":"detachEvent",$=d.dispatchEvent?"dispatchEvent":"fireEvent",v=d[P],L=d[Z],ea=d[$],h={basepath:"/",redirect:0,type:"/",init:0},E="__historyAPI__",S=g.createElement("a"),A=f.href,V="",T=1,D=n,m=0,q={},z={},B=g.title,ha={onhashchange:k,onpopstate:k},aa={setup:function(a, -b,c){h.basepath=(""+(a==k?h.basepath:a)).replace(/(?:^|\/)[^\/]*$/,"/");h.type=b==k?h.type:b;h.redirect=c==k?h.redirect:!!c},redirect:function(a,b){l.setup(b,a);b=h.basepath;if(d.top==d.self){var c=i(k,n,j).c,e=f.pathname+f.search;s?(e=e.replace(/([^\/])$/,"$1/"),c!=b&&RegExp("^"+b+"$","i").test(e)&&f.replace(c)):e!=b&&(e=e.replace(/([^\/])\?/,"$1/?"),RegExp("^"+b,"i").test(e)&&f.replace(b+"#"+e.replace(RegExp("^"+b,"i"),h.type)+f.hash))}},pushState:function(a,b,c){var d=g.title;B!=k&&(g.title=B); -O&&R(O,arguments);u(a,c);g.title=d;B=b},replaceState:function(a,b,c){var d=g.title;B!=k&&(g.title=B);delete q[f.href];Y&&R(Y,arguments);u(a,c,j);g.title=d;B=b},location:{set:function(a){0===m&&(m=1);d.location=a},get:function(){0===m&&(m=1);return s?f:r}},state:{get:function(){return q[f.href]||k}}},M={assign:function(a){0===(""+a).indexOf("#")?u(k,a):f.assign(a)},reload:function(){f.reload()},replace:function(a){0===(""+a).indexOf("#")?u(k,a,j):f.replace(a)},toString:function(){return this.href}, -href:{get:function(){return i().a}},protocol:k,host:k,hostname:k,port:k,pathname:{get:function(){return i().e}},search:{get:function(){return i().f}},hash:{set:function(a){u(k,(""+a).replace(/^(#|)/,"#"),n,A)},get:function(){return i().b}}};if(function(){var a=g.getElementsByTagName("script"),a=(a[a.length-1]||{}).src||"";(-1!==a.indexOf("?")?a.split("?").pop():"").replace(/(\w+)(?:=([^&]*))?/g,function(a,b,c){h[b]=(c||"").replace(/^(0|false)$/,"")});ga();v(x+"hashchange",N,n);var b=[M,r,ha,d,aa, -l];H&&delete aa.state;for(var c=0;clfirst=1;parent.location.hash="'+b.d.replace(/"/g,'\\"')+'";<\/script>'),g.close();!e&&a&&(r[f.href]=a)}};A=function(b,c, +f,g){e.apply(this,arguments)||(b===s?s[c]=f:b===l?(l[c]=f,"state"===c&&(s=a(s),d.history=l=a(l),d.execScript("var history = window.history;","JavaScript"))):b[c]=f.get&&f.get());return b};setInterval(function(){var a=k().a;if(a!=h){var b=g.createEventObject();b.oldURL=h;b.newURL=h=a;b.type="hashchange";O(b)}},100);d.JSON=u}}var d=("object"===typeof window?window:this)||{};if(!d.history||"emulate"in d.history)return d.history;var g=d.document,K=g.documentElement,H=d.Object,u=d.JSON,f=d.location,o= +d.history,l=o,P=o.pushState,X=o.replaceState,t=!!P,J="state"in o,E=H.defineProperty,s=A({},"t")?{}:g.createElement("a"),z="",Q=d.addEventListener?"addEventListener":(z="on")&&"attachEvent",Y=d.removeEventListener?"removeEventListener":"detachEvent",Z=d.dispatchEvent?"dispatchEvent":"fireEvent",w=d[Q],M=d[Y],fa=d[Z],h={basepath:"/",redirect:0,type:"/",init:0},G="__historyAPI__",R=g.createElement("a"),C=f.href,U="",S=1,F=n,m=0,r={},B={},D=g.title,ia={onhashchange:j,onpopstate:j},$={setup:function(a, +b,c){h.basepath=(""+(a==j?h.basepath:a)).replace(/(?:^|\/)[^\/]*$/,"/");h.type=b==j?h.type:b;h.redirect=c==j?h.redirect:!!c},redirect:function(a,b){l.setup(b,a);b=h.basepath;if(d.top==d.self){var c=k(j,n,i).c,e=f.pathname+f.search;t?(e=e.replace(/([^\/])$/,"$1/"),c!=b&&RegExp("^"+b+"$","i").test(e)&&f.replace(c)):e!=b&&(e=e.replace(/([^\/])\?/,"$1/?"),RegExp("^"+b,"i").test(e)&&f.replace(b+"#"+e.replace(RegExp("^"+b,"i"),h.type)+f.hash))}},pushState:function(a,b,c){var d=g.title;D!=j&&(g.title=D); +P&&p(P,arguments);v(a,c);g.title=d;D=b},replaceState:function(a,b,c){var d=g.title;D!=j&&(g.title=D);delete r[f.href];X&&p(X,arguments);v(a,c,i);g.title=d;D=b},location:{set:function(a){0===m&&(m=1);d.location=a},get:function(){0===m&&(m=1);return t?f:s}},state:{get:function(){return r[f.href]||j}}},N={assign:function(a){0===(""+a).indexOf("#")?v(j,a):f.assign(a)},reload:function(){f.reload()},replace:function(a){0===(""+a).indexOf("#")?v(j,a,i):f.replace(a)},toString:function(){return this.href}, +href:{get:function(){return k().a}},protocol:j,host:j,hostname:j,port:j,pathname:{get:function(){return k().e}},search:{get:function(){return k().f}},hash:{set:function(a){v(j,(""+a).replace(/^(#|)/,"#"),n,C)},get:function(){return k().b}}};if(function(){var a=g.getElementsByTagName("script"),a=(a[a.length-1]||{}).src||"";(-1!==a.indexOf("?")?a.split("?").pop():"").replace(/(\w+)(?:=([^&]*))?/g,function(a,b,c){h[b]=(c||"").replace(/^(0|false)$/,"")});ha();w(z+"hashchange",O,n);var b=[N,s,ia,d,$,l]; +J&&delete $.state;for(var c=0;c