From 4580ef89d4eed6e0efe8de057c294df4e2d8d558 Mon Sep 17 00:00:00 2001
From: Prem Sichanugrist <psichanugrist@thoughtbot.com>
Date: Tue, 26 Jun 2012 16:34:06 -0400
Subject: [PATCH] Queue up MathML conversion to be after render
From https://www.pivotaltracker.com/story/show/31700967
Fixes #137
---
.../coffee/spec/modules/problem_spec.coffee | 27 ++++++++++++-------
lms/static/coffee/src/modules/problem.coffee | 15 ++++++-----
2 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/lms/static/coffee/spec/modules/problem_spec.coffee b/lms/static/coffee/spec/modules/problem_spec.coffee
index d59f702063f..7537cd34931 100644
--- a/lms/static/coffee/spec/modules/problem_spec.coffee
+++ b/lms/static/coffee/spec/modules/problem_spec.coffee
@@ -52,8 +52,11 @@ describe 'Problem', ->
it 'bind the math input', ->
expect($('input.math')).toHandleWith 'keyup', @problem.refreshMath
- it 'display the math input', ->
- expect(@stubbedJax.root.toMathML).toHaveBeenCalled()
+ it 'replace math content on the page', ->
+ expect(MathJax.Hub.Queue.mostRecentCall.args).toEqual [
+ ['Text', @stubbedJax, ''],
+ [@problem.updateMathML, @stubbedJax, $('#input_example_1').get(0)]
+ ]
describe 'render', ->
beforeEach ->
@@ -238,23 +241,29 @@ describe 'Problem', ->
describe 'refreshMath', ->
beforeEach ->
@problem = new Problem 1, '/problem/url/'
- @stubbedJax.root.toMathML.andReturn '<MathML>'
$('#input_example_1').val 'E=mc^2'
+ @problem.refreshMath target: $('#input_example_1').get(0)
+
+ it 'should queue the conversion and MathML element update', ->
+ expect(MathJax.Hub.Queue).toHaveBeenCalledWith ['Text', @stubbedJax, 'E=mc^2'],
+ [@problem.updateMathML, @stubbedJax, $('#input_example_1').get(0)]
+
+ describe 'updateMathML', ->
+ beforeEach ->
+ @problem = new Problem 1, '/problem/url/'
+ @stubbedJax.root.toMathML.andReturn '<MathML>'
describe 'when there is no exception', ->
beforeEach ->
- @problem.refreshMath target: $('#input_example_1').get(0)
-
- it 'should convert and display the MathML object', ->
- expect(MathJax.Hub.Queue).toHaveBeenCalledWith ['Text', @stubbedJax, 'E=mc^2']
+ @problem.updateMathML @stubbedJax, $('#input_example_1').get(0)
- it 'should display debug output in hidden div', ->
+ it 'convert jax to MathML', ->
expect($('#input_example_1_dynamath')).toHaveValue '<MathML>'
describe 'when there is an exception', ->
beforeEach ->
@stubbedJax.root.toMathML.andThrow {restart: true}
- @problem.refreshMath target: $('#input_example_1').get(0)
+ @problem.updateMathML @stubbedJax, $('#input_example_1').get(0)
it 'should queue up the exception', ->
expect(MathJax.Callback.After).toHaveBeenCalledWith [@problem.refreshMath, @stubbedJax], true
diff --git a/lms/static/coffee/src/modules/problem.coffee b/lms/static/coffee/src/modules/problem.coffee
index 7edd40a04c7..f8f24a6020f 100644
--- a/lms/static/coffee/src/modules/problem.coffee
+++ b/lms/static/coffee/src/modules/problem.coffee
@@ -79,14 +79,15 @@ class @Problem
target = "display_#{element.id.replace(/^input_/, '')}"
if jax = MathJax.Hub.getAllJax(target)[0]
- MathJax.Hub.Queue ['Text', jax, $(element).val()]
+ MathJax.Hub.Queue ['Text', jax, $(element).val()],
+ [@updateMathML, jax, element]
- try
- output = jax.root.toMathML ''
- $("##{element.id}_dynamath").val(output)
- catch exception
- throw exception unless exception.restart
- MathJax.Callback.After [@refreshMath, jax], exception.restart
+ updateMathML: (jax, element) =>
+ try
+ $("##{element.id}_dynamath").val(jax.root.toMathML '')
+ catch exception
+ throw exception unless exception.restart
+ MathJax.Callback.After [@refreshMath, jax], exception.restart
refreshAnswers: =>
@$('input.schematic').each (index, element) ->
--
GitLab