Merge branch 'bstable'

CHANGELOG.md

@@ -13,6 +13,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
 
 ### v1.11.12
 
+**v1.11.12.8** *(2015-10-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.12.8/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.12.8/builds/4chan-X-noupdate.crx "Chromium version")]
+- Update to support MathJax on /sci/.
+
 **v1.11.12.7** *(2015-10-13)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.12.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.12.7/builds/4chan-X-noupdate.crx "Chromium version")]
 - Add keybind for `[sjis]` tags (default: `Alt+a`).
 - Update max comment length on /jp/ (now 5000, read from board).

src/General/css/style.css

@@ -302,10 +302,6 @@ audio.controls-added {
 .current {
   font-weight: bold;
 }
-:root.fixed.bottom-header #jsMath_button {
-  bottom: auto;
-  top: 1px;
-}
 @media (min-width: 1300px) {
   :root.fixed:not(.centered-links) #header-bar {
     white-space: nowrap;

src/General/css/tomorrow.css

@@ -3,9 +3,6 @@
   background-color: #282A2E;
   border-color: #111;
 }
-:root.tomorrow img[src*="//boards.4chan.org/js/jsMath/fonts/"] {
-  filter: invert(100%);
-}
 
 /* Header */
 :root.tomorrow #header-bar.dialog {

src/Miscellaneous/Fourchan.coffee

@@ -26,15 +26,18 @@ Fourchan =
 
     if g.BOARD.ID is 'sci'
       $.globalEval '''
-        window.addEventListener('jsmath', function(e) {
+        window.addEventListener('mathjax', function(e) {
-          if (!jsMath) return;
+          if (window.MathJax) {
-          if (jsMath.loaded) {
+            window.MathJax.Hub.Queue(function() {
-            // process one post
+              if (!e.target.querySelector('.MathJax')) {
-            jsMath.ProcessBeforeShowing(e.target);
+                window.MathJax.Hub.Typeset(e.target);
-          } else if (jsMath.Autoload && jsMath.Autoload.checked) {
+              }
-            // load jsMath and process whole document
+            });
-            jsMath.Autoload.Script.Push('ProcessBeforeShowing', [null]);
+          } else {
-            jsMath.Autoload.LoadJsMath();
+            if (!document.querySelector('script[src^="//cdn.mathjax.org/"]')) {
+              window.loadMathJax();
+              window.loadMathJax = function() {};
+            }
           }
         }, false);
       '''
@@ -66,6 +69,10 @@ Fourchan =
       return
 
   math: ->
-    return if (@isClone and doc.contains @origin.nodes.root) or !$ '.math', @nodes.comment
+    return unless /\[(math|eqn)\]/.test(@nodes.comment.textContent) or $('.math:not([id])', @nodes.comment)
-    $.asap (=> doc.contains @nodes.comment), =>
+    cb = =>
-      $.event 'jsmath', null, @nodes.comment
+      return unless doc.contains @nodes.comment
+      $.off d, 'PostsInserted', cb
+      $.event 'mathjax', null, @nodes.comment
+    $.on d, 'PostsInserted', cb
+    cb()