From e0a11e4d8ea0f91987df2d435268e060a8836ce7 Mon Sep 17 00:00:00 2001 From: john Date: Fri, 2 Feb 2018 16:10:17 +0800 Subject: [PATCH] Roo.js roojs-core.js roojs-core-debug.js --- Roo.js | 4 ++-- roojs-core-debug.js | 4 ++-- roojs-core.js | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Roo.js b/Roo.js index b7e6ae5c23..d0319f5866 100644 --- a/Roo.js +++ b/Roo.js @@ -50,8 +50,8 @@ Roo.apply = function(o, c, defaults){ var idSeed = 0; var ua = navigator.userAgent.toLowerCase(); - Roo.log('-------ua---------'); - Roo.log(ua); + console.log('-------ua---------'); + console.log(ua); var isStrict = document.compatMode == "CSS1Compat", isOpera = ua.indexOf("opera") > -1, diff --git a/roojs-core-debug.js b/roojs-core-debug.js index e226057974..63c2c5e923 100644 --- a/roojs-core-debug.js +++ b/roojs-core-debug.js @@ -50,8 +50,8 @@ Roo.apply = function(o, c, defaults){ var idSeed = 0; var ua = navigator.userAgent.toLowerCase(); - Roo.log('-------ua---------'); - Roo.log(ua); + console.log('-------ua---------'); + console.log(ua); var isStrict = document.compatMode == "CSS1Compat", isOpera = ua.indexOf("opera") > -1, diff --git a/roojs-core.js b/roojs-core.js index 3c2164fb60..7b9fbee9ad 100644 --- a/roojs-core.js +++ b/roojs-core.js @@ -1,6 +1,6 @@ // 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();Roo.log('-------ua---------'); -Roo.log(ua);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=/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=/iphone|ipad/.test(ua),P=/android/.test(ua),Q=(function(){try{if(ua.indexOf('chrome')!=-1&&ua.indexOf('android')==-1){window.addEventListener('touchstart',function __set_has_touch__(){Roo.isTouch=true; +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();console.log('-------ua---------'); +console.log(ua);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=/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=/iphone|ipad/.test(ua),P=/android/.test(ua),Q=(function(){try{if(ua.indexOf('chrome')!=-1&&ua.indexOf('android')==-1){window.addEventListener('touchstart',function __set_has_touch__(){Roo.isTouch=true; window.removeEventListener('touchstart',__set_has_touch__);});return false;}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 R={};for(var b in o){var S=b.split('@');if(S[1]){var s=S[0]; if(!R[s]){R[s]=Roo.select(s);}R[s].on(S[1],o[b]);}}R=null;},id:function(el,R){R=R||"roo-gen";el=Roo.getDom(el);var id=R+(++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,R){if(typeof sp=='object'){R=sp; -- 2.39.2