jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix browser detection code in IE.

This commit is contained in:
Joel Martin 2010-06-21 16:30:32 -05:00
parent 3915e5365e
commit 11bb7a4ae4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/util.js
View File

@ -15,7 +15,10 @@ var Util = {}, $;
// Debug routines // Debug routines
if (typeof window.console === "undefined") { if (typeof window.console === "undefined") {
window.console = window.console || {}; window.console = {
'log': function(m) {},
'warn': function(m) {},
'error': function(m) {}};
} }
if (/__debug__$/i.test(document.location.href)) { if (/__debug__$/i.test(document.location.href)) {
if (typeof window.opera !== "undefined") { if (typeof window.opera !== "undefined") {
@ -24,10 +27,12 @@ if (/__debug__$/i.test(document.location.href)) {
window.console.error = window.opera.postError; window.console.error = window.opera.postError;
} }
} else { } else {
/*
// non-debug mode, an empty function // non-debug mode, an empty function
window.console.log = function (message) {}; window.console.log = function (message) {};
window.console.warn = function (message) {}; window.console.warn = function (message) {};
window.console.error = function (message) {}; window.console.error = function (message) {};
*/
} }
// Simple DOM selector by ID // Simple DOM selector by ID
@ -207,7 +212,9 @@ Util.Engine = {
'trident': (function() { 'trident': (function() {
return (!window.ActiveXObject) ? false : ((window.XMLHttpRequest) ? ((document.querySelectorAll) ? 6 : 5) : 4); }()), return (!window.ActiveXObject) ? false : ((window.XMLHttpRequest) ? ((document.querySelectorAll) ? 6 : 5) : 4); }()),
'webkit': (function() { 'webkit': (function() {
return (navigator.taintEnabled) ? false : ((Util.Features.xpath) ? ((Util.Features.query) ? 525 : 420) : 419); }()), try { return (navigator.taintEnabled) ? false : ((Util.Features.xpath) ? ((Util.Features.query) ? 525 : 420) : 419); } catch (e) { return false; } }()),
//'webkit': (function() {
// return ((typeof navigator.taintEnabled !== "unknown") && navigator.taintEnabled) ? false : ((Util.Features.xpath) ? ((Util.Features.query) ? 525 : 420) : 419); }()),
'gecko': (function() { 'gecko': (function() {
return (!document.getBoxObjectFor && !window.mozInnerScreenX) ? false : ((document.getElementsByClassName) ? 19 : 18); }()) return (!document.getBoxObjectFor && !window.mozInnerScreenX) ? false : ((document.getElementsByClassName) ? 19 : 18); }())
}; };