Resolve a conflict with Mathjax and Slidy (its sets window.opera, which confused the browser detection)

This commit is contained in:
Davide P. Cervone 2011-04-05 12:25:44 -04:00
parent 4a2969c45b
commit bb09608b23
2 changed files with 4 additions and 4 deletions

File diff suppressed because one or more lines are too long

View File

@ -29,7 +29,7 @@ if (document.getElementById && document.childNodes && document.createElement) {
if (!window.MathJax) {window.MathJax= {}}
if (!MathJax.Hub) { // skip if already loaded
MathJax.version = "1.1.1";
MathJax.version = "1.1.2";
/**********************************************************/
@ -1979,8 +1979,8 @@ MathJax.Hub.Startup = {
isMac: (navigator.platform.substr(0,3) === "Mac"),
isPC: (navigator.platform.substr(0,3) === "Win"),
isMSIE: (window.ActiveXObject != null && window.clipboardData != null),
isFirefox: (window.netscape != null && document.ATTRIBUTE_NODE != null && window.opera == null),
isSafari: (navigator.userAgent.match(/ (Apple)?WebKit\//) != null && window.chrome == null),
isFirefox: (window.netscape != null && document.ATTRIBUTE_NODE != null && !window.opera),
isSafari: (navigator.userAgent.match(/ (Apple)?WebKit\//) != null && !window.chrome),
isChrome: (window.chrome != null && window.chrome.loadTimes != null),
isOpera: (window.opera != null && window.opera.version != null),
isKonqueror: (window.hasOwnProperty && window.hasOwnProperty("konqueror") && navigator.vendor == "KDE"),