Merge branch 'fix/TAO-2460-mathjax-error-500' into fix/TAO-2460-mathj…

…ax-error
oat-sa · Mar 31, 2016 · 894c898 · 894c898
2 parents c1a0d76 + 566eb3c
commit 894c898
Show file tree

Hide file tree

Showing 7 changed files with 74 additions and 30 deletions.
diff --git a/manifest.php b/manifest.php
@@ -26,7 +26,7 @@
     'label' => 'QTI item model',
 	'description' => 'TAO QTI item model',
     'license' => 'GPL-2.0',
-    'version' => '2.12.10',
+    'version' => '2.12.11',
 	'author' => 'Open Assessment Technologies',
 	'requires' => array(
 	    'taoItems' => '>=2.9.7'

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -213,7 +213,7 @@ public function update($initialVersion){
         }
 
         $this->setVersion($currentVersion);
-        $this->skip('2.12.9', '2.12.10');
+        $this->skip('2.12.9', '2.12.11');
     }
 
 }
diff --git a/views/js/controllers.min.js b/views/js/controllers.min.js
diff --git a/views/js/controllers.min.js.map b/views/js/controllers.min.js.map
diff --git a/views/js/qtiCreator/editor/MathEditor.js b/views/js/qtiCreator/editor/MathEditor.js
@@ -86,9 +86,16 @@ define([
             jaxQueue.Push(
                 ["Typeset", MathJax.Hub, this.$buffer[0]],
                 function(){
+                    var $script = _this.$buffer.find('script');
+
                     _this.processing = false;
 
                     args.target.html(_this.$buffer.html());
+
+                    if ($script.length){
+                        _this.mathML = _stripMathTags($script.html());
+                    }
+
                     _this.$buffer.empty();
                 }
             );
@@ -159,8 +166,8 @@ define([
         };
 
         var _stripComments = function(mathMLstr) {
-            mathMLstr = mathMLstr.replace(/<!--.*?-->/, '');
-            mathMLstr = mathMLstr.replace(/&lt;!--.*?--&gt;/, '');
+            mathMLstr = mathMLstr.replace(/<!--.*?-->/g, '');
+            mathMLstr = mathMLstr.replace(/&lt;!--.*?--&gt;/g, '');
 
             return mathMLstr;
         };

diff --git a/views/js/qtiCreator/test/MathEditor/test.html b/views/js/qtiCreator/test/MathEditor/test.html
@@ -2,7 +2,7 @@
 <html>
     <head>
         <meta charset="utf-8">
-        <title>QtiElements Test - QTI item model information model definition </title>
+        <title>MathJax Editor Test</title>
         <link rel="stylesheet" type="text/css" href="/tao/views/js/lib/qunit/qunit.css">
         <script type="text/javascript" src="/tao/views/js/lib/require.js"></script>
         <script type="text/javascript" src="/tao/views/js/lib/qunit/qunit.js"></script>

diff --git a/views/js/qtiCreator/test/MathEditor/test.js b/views/js/qtiCreator/test/MathEditor/test.js
@@ -38,11 +38,7 @@ function($, MathEditor, mathJax) {
                     display: data.display
                 });
 
-            if (typeof mathJax === 'undefined') {
-                assert.ok(false, 'MathJax is not available');
-                QUnit.start();
-
-            } else {
+            if (isMathJaxAvailable()) {
                 mathEditor.setTex(data.input);
                 mathEditor.renderFromTex();
 
@@ -60,6 +56,7 @@ function($, MathEditor, mathJax) {
 
     QUnit.module('Matheditor MathML rendering');
 
+
     var texWithSpecialChars = [
         { title: 'lower than', input: 'w < y' },
         { title: 'lower than equal', input: 'x \\leq y' },
@@ -76,15 +73,10 @@ function($, MathEditor, mathJax) {
 
                 mathEditor = new MathEditor({
                     buffer: $buffer,
-                    target: $target,
-                    display: data.display
+                    target: $target
                 });
 
-            if (typeof mathJax === 'undefined') {
-                assert.ok(false, 'MathJax is not available');
-                QUnit.start();
-
-            } else {
+            if (isMathJaxAvailable()) {
                 mathEditor.setTex(data.input);
                 mathEditor.renderFromTex();
 
@@ -101,6 +93,7 @@ function($, MathEditor, mathJax) {
             }
         });
 
+
     var mathMLWithComments = [
         { title: 'plain comment', input: '<mstyle displaystyle="true" scriptlevel="0"><mrow class="MJX-TeXAtom-ORD"><mi>x</mi><mo>&#x2264;<!-- ≤ --></mo><mi>w</mi></mrow></mstyle>'},
         { title: 'html-encoded comment', input: '<mstyle displaystyle="true" scriptlevel="0"><mrow class="MJX-TeXAtom-ORD"><mi>x</mi><mo>&#x2264;&lt;!-- ≤ --&gt;</mo><mi>w</mi></mrow></mstyle>'}
@@ -116,15 +109,10 @@ function($, MathEditor, mathJax) {
 
                 mathEditor = new MathEditor({
                     buffer: $buffer,
-                    target: $target,
-                    display: data.display
+                    target: $target
                 });
 
-            if (typeof mathJax === 'undefined') {
-                assert.ok(false, 'MathJax is not available');
-                QUnit.start();
-
-            } else {
+            if (isMathJaxAvailable()) {
                 mathEditor.setMathML(data.input);
                 mathEditor.renderFromMathML();
 
@@ -144,6 +132,55 @@ function($, MathEditor, mathJax) {
     function doesntContainsComments(string) {
         return string.match(/<!--.*?-->/) === null && string.match(/&lt;!--.*?--&gt;/) === null;
     }
+
+
+    var mathMLWithSpecialChars = [
+        { title: 'inferior',
+            input: '<mstyle><mrow><mi>x</mi><mo><</mo><mi>y</mi></mrow></mstyle>',
+            output: '<mstyle><mrow><mi>x</mi><mo>&lt;</mo><mi>y</mi></mrow></mstyle>' },
+        { title: 'superior',
+            input: '<mstyle><mrow><mi>x</mi><mo>></mo><mi>y</mi></mrow></mstyle>',
+            output: '<mstyle><mrow><mi>x</mi><mo>&gt;</mo><mi>y</mi></mrow></mstyle>' },
+        { title: 'both',
+            input: '<mstyle><mrow><mi>x</mi><mo>></mo><mi>y</mi><mo><</mo><mi>y</mi></mrow></mstyle>',
+            output: '<mstyle><mrow><mi>x</mi><mo>&gt;</mo><mi>y</mi><mo>&lt;</mo><mi>y</mi></mrow></mstyle>' }
+    ];
+
+    QUnit
+        .cases(mathMLWithSpecialChars)
+        .asyncTest('MathML rendering encodes special chars', 1, function test(data, assert) {
+            var mathjaxRenderingDelayMs = 750,
+
+                $buffer = $('.mj-buffer'),
+                $target = $('.mj-target'),
+
+                mathEditor = new MathEditor({
+                    buffer: $buffer,
+                    target: $target
+                });
+
+            if (isMathJaxAvailable()) {
+                mathEditor.setMathML(data.input);
+                mathEditor.renderFromMathML();
+
+                setTimeout(function checkMathJaxOutput() {
+                    assert.strictEqual(mathEditor.mathML, data.output);
+
+                    QUnit.start();
+                }, mathjaxRenderingDelayMs);
+            }
+        });
+
+    function isMathJaxAvailable() {
+        if (typeof mathJax === 'undefined') {
+            QUnit.assert.ok(false, 'MathJax is not available');
+            QUnit.start();
+
+            return false;
+        }
+        return true;
+    }
+
 });