Merge branch 'issue317' into develop

This commit is contained in:
Davide P. Cervone 2012-09-29 15:06:36 -04:00
commit e7b29726b6
10 changed files with 12 additions and 10 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -2334,7 +2334,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),
isFirefox: ((window.netscape != null || window.mozPaintCount != null) &&
document.ATTRIBUTE_NODE != null && !window.opera),
isSafari: (navigator.userAgent.match(/ (Apple)?WebKit\//) != null &&
(!window.chrome || window.chrome.loadTimes == null)),
isChrome: (window.chrome != null && window.chrome.loadTimes != null),

View File

@ -292,8 +292,9 @@
hideProcessedMath: true, // use display:none until all math is processed
Font: null, // created by Config() below
Font: null, // created by Config() below
webFontDefault: "MathJax_Blank",
allowWebFonts: "otf", // assume browser can use OTF web fonts
Config: function () {
if (!this.require) {this.require = []}