Skip to content

Commit e7b2972

Browse files
committed
Merge branch 'issue317' into develop
2 parents 7347b53 + bc9fd85 commit e7b2972

File tree

10 files changed

+12
-10
lines changed

10 files changed

+12
-10
lines changed

MathJax.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/AM_HTMLorMML-full.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/Accessible-full.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/MML_HTMLorMML-full.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/TeX-AMS-MML_HTMLorMML-full.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/TeX-AMS_HTML-full.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/TeX-MML-AM_HTMLorMML-full.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

jax/output/HTML-CSS/jax.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unpacked/MathJax.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2334,7 +2334,8 @@ MathJax.Hub.Startup = {
23342334
isMac: (navigator.platform.substr(0,3) === "Mac"),
23352335
isPC: (navigator.platform.substr(0,3) === "Win"),
23362336
isMSIE: (window.ActiveXObject != null && window.clipboardData != null),
2337-
isFirefox: (window.netscape != null && document.ATTRIBUTE_NODE != null && !window.opera),
2337+
isFirefox: ((window.netscape != null || window.mozPaintCount != null) &&
2338+
document.ATTRIBUTE_NODE != null && !window.opera),
23382339
isSafari: (navigator.userAgent.match(/ (Apple)?WebKit\//) != null &&
23392340
(!window.chrome || window.chrome.loadTimes == null)),
23402341
isChrome: (window.chrome != null && window.chrome.loadTimes != null),

unpacked/jax/output/HTML-CSS/jax.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,8 +292,9 @@
292292

293293
hideProcessedMath: true, // use display:none until all math is processed
294294

295-
Font: null, // created by Config() below
295+
Font: null, // created by Config() below
296296
webFontDefault: "MathJax_Blank",
297+
allowWebFonts: "otf", // assume browser can use OTF web fonts
297298

298299
Config: function () {
299300
if (!this.require) {this.require = []}

0 commit comments

Comments
 (0)