Roo.js

[roojs1] / Roo.js

diff --git a/Roo.js b/Roo.js
index c7ac781..df4fe80 100644 (file)
--- a/Roo.js
+++ b/Roo.js
@@ -57,6 +57,7 @@ Roo.apply = function(o, c, defaults){
         isIE = ua.indexOf("msie") > -1,
         isIE7 = ua.indexOf("msie 7") > -1,
         isIE11 = /trident.*rv\:11\./.test(ua),
+        isEdge = ua.indexOf("edge") > -1,
         isGecko = !isSafari && ua.indexOf("gecko") > -1,
         isBorderBox = isIE && !isStrict,
         isWindows = (ua.indexOf("windows") != -1 || ua.indexOf("win32") != -1),
@@ -64,12 +65,13 @@ 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) {
                     window.addEventListener('touchstart', function __set_has_touch__ () {
                         Roo.isTouch = true;
-                        winow.removeEventListener('touchstart', __set_has_touch__);
+                        window.removeEventListener('touchstart', __set_has_touch__);
                     });
                     return false; // no touch on chrome!?
                 }
@@ -640,6 +642,8 @@ Roo.factory(conf, Roo.data);
         /** @type Boolean */
         isIOS : isIOS,
         /** @type Boolean */
+        isAndroid : isAndroid,
+        /** @type Boolean */
         isTouch : isTouch,
 
         /**