X-Git-Url: http://git.roojs.org/?p=roojs1;a=blobdiff_plain;f=Roo.js;h=67147c5ee6efd7a6f1be03c969fb9561af26ca52;hp=c6542150be0198f80a7c6f78e71630c7f5c3f76a;hb=refs%2Fheads%2Fwip_alan_T6102_issue_with_word_clean;hpb=371c195eb26a9a3ba996cb90f1dacb65914f5025 diff --git a/Roo.js b/Roo.js index c6542150be..67147c5ee6 100644 --- 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,7 +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, + isEdge = ua.indexOf("edge") > -1, isGecko = !isSafari && ua.indexOf("gecko") > -1, isBorderBox = isIE && !isStrict, isWindows = (ua.indexOf("windows") != -1 || ua.indexOf("win32") != -1), @@ -345,8 +342,8 @@ Roo.factory(conf, Roo.data); if ((typeof(console) == 'undefined') || (typeof(console.log) == 'undefined')) { return; // alerT? } - console.log(s); + console.log(s); }, /** * Takes an object and converts it to an encoded URL. e.g. Roo.urlEncode({foo: 1, bar: 2}); would return "foo=1&bar=2". Optionally, property values can be arrays, instead of keys and the resulting string that's returned will contain a name/value pair for each array value. @@ -633,6 +630,8 @@ Roo.factory(conf, Roo.data); /** @type Boolean */ isIE11 : isIE11, /** @type Boolean */ + isEdge : isEdge, + /** @type Boolean */ isGecko : isGecko, /** @type Boolean */ isBorderBox : isBorderBox,