From b464dfcba2029161ca47fcbe65947cd40af97268 Mon Sep 17 00:00:00 2001 From: edward Date: Fri, 4 Dec 2015 11:29:57 +0800 Subject: [PATCH] roojs-core.js roojs-core-debug.js --- roojs-core-debug.js | 3 +++ roojs-core.js | 18 +++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/roojs-core-debug.js b/roojs-core-debug.js index 87129cb75a..4b70d7bf9d 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -56,6 +56,7 @@ Roo.apply = function(o, c, defaults){ isFirefox = ua.indexOf("firefox") > -1, isIE = ua.indexOf("msie") > -1, isIE7 = ua.indexOf("msie 7") > -1, + isIE11 = /Trident.*rv\:11\./.test(ua), isGecko = !isSafari && ua.indexOf("gecko") > -1, isBorderBox = isIE && !isStrict, isWindows = (ua.indexOf("windows") != -1 || ua.indexOf("win32") != -1), @@ -617,6 +618,8 @@ Roo.factory(conf, Roo.data); /** @type Boolean */ isIE7 : isIE7, /** @type Boolean */ + isIE11 : isIE11, + /** @type Boolean */ isGecko : isGecko, /** @type Boolean */ isBorderBox : isBorderBox, diff --git a/roojs-core.js b/roojs-core.js index fc61ca6c35..a3f5443ca1 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -1,14 +1,14 @@ //Roo.js -window["undefined"]=window["undefined"];var Roo={};Roo.apply=function(o,c,A){if(A){Roo.apply(o,A);}if(o&&c&&typeof c=='object'){for(var p in c){o[p]=c[p];}}return o;};(function(){var A=0;var ua=navigator.userAgent.toLowerCase();var B=document.compatMode=="CSS1Compat",C=ua.indexOf("opera")>-1,D=(/webkit|khtml/).test(ua),E=ua.indexOf("firefox")>-1,F=ua.indexOf("msie")>-1,G=ua.indexOf("msie 7")>-1,H=!D&&ua.indexOf("gecko")>-1,I=F&&!B,J=(ua.indexOf("windows")!=-1||ua.indexOf("win32")!=-1),K=(ua.indexOf("macintosh")!=-1||ua.indexOf("mac os x")!=-1),L=(ua.indexOf("linux")!=-1),M=window.location.href.toLowerCase().indexOf("https")===0,N=(function(){try{document.createEvent("TouchEvent");return true;}catch(e){return false;}})();if(F&&!G){try{document.execCommand("BackgroundImageCache",false,true);}catch(e){}} -Roo.apply(Roo,{isStrict:B,isSecure:M,isReady:false,debug:false,enableGarbageCollector:true,enableListenerCollection:false,SSL_SECURE_URL:"javascript:false",BLANK_IMAGE_URL:"http:/"+"/localhost/s.gif",emptyFn:function(){},applyIf:function(o,c){if(o&&c){for(var p in c){if(typeof o[p]=="undefined"){o[p]=c[p];}}}return o;},addBehaviors:function(o){if(!Roo.isReady){Roo.onReady(function(){Roo.addBehaviors(o);});return;}var O={};for(var b in o){var P=b.split('@');if(P[1]){var s=P[0];if(!O[s]){O[s]=Roo.select(s);} -O[s].on(P[1],o[b]);}} -O=null;},id:function(el,O){O=O||"roo-gen";el=Roo.getDom(el);var id=O+(++A);return el?(el.id?el.id:(el.id=id)):id;},extend:function(){var io=function(o){for(var m in o){this[m]=o[m];}};return function(sb,sp,O){if(typeof sp=='object'){O=sp;sp=sb;sb=function(){sp.apply(this,arguments);};}var F=function(){},P,Q=sp.prototype;F.prototype=Q;P=sb.prototype=new F();P.constructor=sb;sb.superclass=Q;if(Q.constructor==Object.prototype.constructor){Q.constructor=sp;} -sb.override=function(o){Roo.override(sb,o);};P.override=io;Roo.override(sb,O);return sb;};}(),override:function(O,P){if(P){var p=O.prototype;for(var Q in P){p[Q]=P[Q];}}},namespace:function(){var a=arguments,o=null,i,j,d,rt;for(i=0;i-1,D=(/webkit|khtml/).test(ua),E=ua.indexOf("firefox")>-1,F=ua.indexOf("msie")>-1,G=ua.indexOf("msie 7")>-1,H=/Trident.*rv\:11\./.test(ua),I=!D&&ua.indexOf("gecko")>-1,J=F&&!B,K=(ua.indexOf("windows")!=-1||ua.indexOf("win32")!=-1),L=(ua.indexOf("macintosh")!=-1||ua.indexOf("mac os x")!=-1),M=(ua.indexOf("linux")!=-1),N=window.location.href.toLowerCase().indexOf("https")===0,O=(function(){try{document.createEvent("TouchEvent");return true;}catch(e){return false;}})();if(F&&!G){try{document.execCommand("BackgroundImageCache",false,true);}catch(e){}} +Roo.apply(Roo,{isStrict:B,isSecure:N,isReady:false,debug:false,enableGarbageCollector:true,enableListenerCollection:false,SSL_SECURE_URL:"javascript:false",BLANK_IMAGE_URL:"http:/"+"/localhost/s.gif",emptyFn:function(){},applyIf:function(o,c){if(o&&c){for(var p in c){if(typeof o[p]=="undefined"){o[p]=c[p];}}}return o;},addBehaviors:function(o){if(!Roo.isReady){Roo.onReady(function(){Roo.addBehaviors(o);});return;}var P={};for(var b in o){var Q=b.split('@');if(Q[1]){var s=Q[0];if(!P[s]){P[s]=Roo.select(s);} +P[s].on(Q[1],o[b]);}} +P=null;},id:function(el,P){P=P||"roo-gen";el=Roo.getDom(el);var id=P+(++A);return el?(el.id?el.id:(el.id=id)):id;},extend:function(){var io=function(o){for(var m in o){this[m]=o[m];}};return function(sb,sp,P){if(typeof sp=='object'){P=sp;sp=sb;sb=function(){sp.apply(this,arguments);};}var F=function(){},Q,R=sp.prototype;F.prototype=R;Q=sb.prototype=new F();Q.constructor=sb;sb.superclass=R;if(R.constructor==Object.prototype.constructor){R.constructor=sp;} +sb.override=function(o){Roo.override(sb,o);};Q.override=io;Roo.override(sb,P);return sb;};}(),override:function(P,Q){if(Q){var p=P.prototype;for(var R in Q){p[R]=Q[R];}}},namespace:function(){var a=arguments,o=null,i,j,d,rt;for(i=0;i0x10000){bs[0]=0xF0|((c&0x1C0000)>>>18);bs[1]=0x80|((c&0x3F000)>>>12);bs[2]=0x80|((c&0xFC0)>>>6);bs[3]=0x80|(c&0x3F);}else if(c>0x800){bs[0]=0xE0|((c&0xF000)>>>12);bs[1]=0x80|((c&0xFC0)>>>6);bs[2]=0x80|(c&0x3F);}else if(c>0x80){bs[0]=0xC0|((c&0x7C0)>>>6);bs[1]=0x80|(c&0x3F);}else {bs[0]=c;}for(var j=0;j>>4)+nibble_to_hex(b&0x0F);P+='%'+Q;}}return P;},urlDecode:function(O,P){if(!O||!O.length){return {};}var Q={};var R=O.split('&');var S,T,U;for(var i=0,V=R.length;i0x10000){bs[0]=0xF0|((c&0x1C0000)>>>18);bs[1]=0x80|((c&0x3F000)>>>12);bs[2]=0x80|((c&0xFC0)>>>6);bs[3]=0x80|(c&0x3F);}else if(c>0x800){bs[0]=0xE0|((c&0xF000)>>>12);bs[1]=0x80|((c&0xFC0)>>>6);bs[2]=0x80|(c&0x3F);}else if(c>0x80){bs[0]=0xC0|((c&0x7C0)>>>6);bs[1]=0x80|(c&0x3F);}else {bs[0]=c;}for(var j=0;j>>4)+nibble_to_hex(b&0x0F);Q+='%'+R;}}return Q;},urlDecode:function(P,Q){if(!P||!P.length){return {};}var R={};var S=P.split('&');var T,U,V;for(var i=0,W=S.length;i