Merge branch 'dev'

qui/lib/css.js

@@ -568,7 +568,9 @@
                 if (typeof window.QUIQQER_CSS_PREFETCHED !== 'undefined') {
                     var rurl = url.split('?')[0];
 
-                    if (typeof window.QUIQQER_CSS_PREFETCHED[rurl] !== 'undefined') {
+                    if (typeof window.QUIQQER_CSS_PREFETCHED[rurl] !== 'undefined' ||
+                        typeof window.QUIQQER_CSS_PREFETCHED[resourceId] !== 'undefined') {
+
                         loaded(new Element('div'));
                         return;
                     }

qui/lib/css.min.js

-!function(n){"use strict";var e,t,o="createElement",r=n.setTimeout,i=n.document,u=i&&i.createStyleSheet&&!(i.documentMode>=10),c=[],s=[],l=[],f=12,a="HTTP or network error.",d={};function h(n,e){d[n]=d[n]||e}function p(){var n;return(n=i[o]("link")).rel="stylesheet",n.type="text/css",n}function v(n){n.onload=n.onerror=g}function E(n){return n.onload==g||!n.onload}function m(){return!i.readyState||"complete"===i.readyState}function g(){}i&&(e=i.head||i.getElementsByTagName("head")[0],t=u?function(n,t,o){var r;l.push({url:n,cb:t,eb:function(){o(new Error(a))}}),!(u=s.shift())&&c.length<f&&(u=i.createElement("style"),c.push(u),e.appendChild(u)),(r=u)&&function n(e){var t,o;t=l.shift();o=e.styleSheet;t?(e.onload=function(){t.cb(t.ss),n(e)},e.onerror=function(){t.eb(),n(e)},t.ss=o.imports[o.addImport(t.url)]):(v(e),function(n){s.push(n)}(e))}(r);var u}:function(n,t,o,i){var u;(function(n,e,t){function o(){E(n)||(v(n),function(n){!function e(){m()?n():r(e,10)}()}(function(){t(n.sheet)}))}(function(n,e){n.onload=function(){h("load",!0),e()}})(n,o),function n(e,t,o){if(d.load)return;!function(n){var e,t,o;if(!n.href||!m())return!1;e=!1;try{(t=n.sheet)&&(o=t.cssRules,!(e=null===o)&&o&&(t.insertRule("-curl-css-test {}",0),t.deleteRule(0),e=!0))}catch(n){e="[object Opera]"!==Object.prototype.toString.call(window.opera)&&!1===/security|denied/i.test(n.message)}return e}(e)?E(e)||r(function(){n(e,t,o)},t):o(e.sheet)}(n,e,o)})(u=p(),i,t),function(n,e,t){function o(){E(n)||(v(n),t(new Error(a)))}!function(n,e){n.onerror=function(){h("error",!0),e()}}(n,o)}(u,0,o),u.href=n,e.appendChild(u)}),define({normalize:function(n,e){var t,o;if(!n)return n;o=[];for(var r=0,i=(t=n.split(",")).length;r<i;r++)o.push(e(t[r]));return o.join(",")},load:function(n,o,r,i){var u,c,s,l,f,a,d,h;function v(n){c.length>1&&u.push(n),0==--f&&r(1===c.length?n:u)}function E(n){(r.reject||function(n){throw n})(n)}for(u=[],c=(n||"").split(","),s=i.cssWatchPeriod||50,l=i.cssNoWait,f=c.length,a=0;a<c.length;a++){var m,g;if(n=c[a],d=o.toUrl(n),h="css",m=d.lastIndexOf(".")<=d.lastIndexOf("/")?d+"."+h:d,void 0!==window.QUIQQER_CSS_PREFETCHED){var y=m.split("?")[0];if(void 0!==window.QUIQQER_CSS_PREFETCHED[y])return void v(new Element("div"))}l?((g=p()).href=m,e.appendChild(g),v(g.sheet||g.styleSheet)):t(m,v,E,s)}},"plugin-builder":"css",pluginBuilder:"css"})}(this);
+!function(n){"use strict";var e,t,o="createElement",r=n.setTimeout,i=n.document,u=i&&i.createStyleSheet&&!(i.documentMode>=10),c=[],s=[],l=[],f=12,a="HTTP or network error.",d={};function h(n,e){d[n]=d[n]||e}function p(){var n;return(n=i[o]("link")).rel="stylesheet",n.type="text/css",n}function E(n){n.onload=n.onerror=w}function v(n){return n.onload==w||!n.onload}function m(){return!i.readyState||"complete"===i.readyState}function w(){}i&&(e=i.head||i.getElementsByTagName("head")[0],t=u?function(n,t,o){var r;l.push({url:n,cb:t,eb:function(){o(new Error(a))}}),!(u=s.shift())&&c.length<f&&(u=i.createElement("style"),c.push(u),e.appendChild(u)),(r=u)&&function n(e){var t,o;t=l.shift();o=e.styleSheet;t?(e.onload=function(){t.cb(t.ss),n(e)},e.onerror=function(){t.eb(),n(e)},t.ss=o.imports[o.addImport(t.url)]):(E(e),function(n){s.push(n)}(e))}(r);var u}:function(n,t,o,i){var u;(function(n,e,t){function o(){v(n)||(E(n),function(n){!function e(){m()?n():r(e,10)}()}(function(){t(n.sheet)}))}(function(n,e){n.onload=function(){h("load",!0),e()}})(n,o),function n(e,t,o){if(d.load)return;!function(n){var e,t,o;if(!n.href||!m())return!1;e=!1;try{(t=n.sheet)&&(o=t.cssRules,!(e=null===o)&&o&&(t.insertRule("-curl-css-test {}",0),t.deleteRule(0),e=!0))}catch(n){e="[object Opera]"!==Object.prototype.toString.call(window.opera)&&!1===/security|denied/i.test(n.message)}return e}(e)?v(e)||r(function(){n(e,t,o)},t):o(e.sheet)}(n,e,o)})(u=p(),i,t),function(n,e,t){function o(){v(n)||(E(n),t(new Error(a)))}!function(n,e){n.onerror=function(){h("error",!0),e()}}(n,o)}(u,0,o),u.href=n,e.appendChild(u)}),define({normalize:function(n,e){var t,o;if(!n)return n;o=[];for(var r=0,i=(t=n.split(",")).length;r<i;r++)o.push(e(t[r]));return o.join(",")},load:function(n,o,r,i){var u,c,s,l,f,a,d,h;function E(n){c.length>1&&u.push(n),0==--f&&r(1===c.length?n:u)}function v(n){(r.reject||function(n){throw n})(n)}for(u=[],c=(n||"").split(","),s=i.cssWatchPeriod||50,l=i.cssNoWait,f=c.length,a=0;a<c.length;a++){var m,w;if(n=c[a],d=o.toUrl(n),h="css",m=d.lastIndexOf(".")<=d.lastIndexOf("/")?d+"."+h:d,void 0!==window.QUIQQER_CSS_PREFETCHED){var S=m.split("?")[0];if(void 0!==window.QUIQQER_CSS_PREFETCHED[S]||void 0!==window.QUIQQER_CSS_PREFETCHED[n])return void E(new Element("div"))}l?((w=p()).href=m,e.appendChild(w),E(w.sheet||w.styleSheet)):t(m,E,v,s)}},"plugin-builder":"css",pluginBuilder:"css"})}(this);