Roo/bootstrap/Table.js

[roojs1] / Roo.js

diff --git a/Roo.js b/Roo.js
index d0319f5..54e8329 100644 (file)
--- a/Roo.js
+++ b/Roo.js
@@ -50,9 +50,6 @@ Roo.apply = function(o, c, defaults){
     var idSeed = 0;
     var ua = navigator.userAgent.toLowerCase();
 
-    console.log('-------ua---------');
-    console.log(ua);
-
     var isStrict = document.compatMode == "CSS1Compat",
         isOpera = ua.indexOf("opera") > -1,
         isSafari = (/webkit|khtml/).test(ua),
@@ -60,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),
@@ -632,6 +630,8 @@ Roo.factory(conf, Roo.data);
         /** @type Boolean */
         isIE11 : isIE11,
         /** @type Boolean */
+        isEdge : isEdge,
+        /** @type Boolean */
         isGecko : isGecko,
         /** @type Boolean */
         isBorderBox : isBorderBox,