Roo.js

[roojs1] / Roo.js

diff --git a/Roo.js b/Roo.js
index 89e3acf..b7e6ae5 100644 (file)
--- a/Roo.js
+++ b/Roo.js
@@ -50,6 +50,9 @@ Roo.apply = function(o, c, defaults){
     var idSeed = 0;
     var ua = navigator.userAgent.toLowerCase();
 
+    Roo.log('-------ua---------');
+    Roo.log(ua);
+
     var isStrict = document.compatMode == "CSS1Compat",
         isOpera = ua.indexOf("opera") > -1,
         isSafari = (/webkit|khtml/).test(ua),
@@ -64,6 +67,7 @@ Roo.apply = function(o, c, defaults){
         isLinux = (ua.indexOf("linux") != -1),
         isSecure = window.location.href.toLowerCase().indexOf("https") === 0,
         isIOS = /iphone|ipad/.test(ua),
+        isAndroid = /android/.test(ua),
         isTouch =  (function() {
             try {
                 if (ua.indexOf('chrome') != -1 && ua.indexOf('android') == -1) {
@@ -314,7 +318,6 @@ Roo.factory(conf, Roo.data);
         {
             // no xtype, no ns or c.xns - or forced off by c.xns
             if (!c.xtype   || (!ns && !c.xns) ||  (c.xns === false)) { // not enough info...
-                Roo.log('in???');
                 return c;
             }
             ns = c.xns ? c.xns : ns; // if c.xns is set, then use that..
@@ -641,6 +644,8 @@ Roo.factory(conf, Roo.data);
         /** @type Boolean */
         isIOS : isIOS,
         /** @type Boolean */
+        isAndroid : isAndroid,
+        /** @type Boolean */
         isTouch : isTouch,
 
         /**