Properly handle loading of jax during prepareOutput so that it works in combined configuration files

This commit is contained in:
Davide P. Cervone 2011-09-04 16:52:44 -04:00
parent bb3129d5db
commit a4fdb7b815
2 changed files with 9 additions and 3 deletions

File diff suppressed because one or more lines are too long

View File

@ -1506,7 +1506,13 @@ MathJax.Hub = {
while (state.j < state.jaxIDs.length) { while (state.j < state.jaxIDs.length) {
var id = state.jaxIDs[state.j], JAX = MathJax.OutputJax[id]; var id = state.jaxIDs[state.j], JAX = MathJax.OutputJax[id];
if (JAX[method]) { if (JAX[method]) {
try {JAX[method](state)} catch (err) { try {
var result = JAX[method](state);
if (typeof result === 'function') {
if (result.called) continue; // go back and try again
this.RestartAfter(result);
}
} catch (err) {
if (!err.restart) { if (!err.restart) {
MathJax.Message.Set("Error preparing "+id+" output ("+method+")",null,600); MathJax.Message.Set("Error preparing "+id+" output ("+method+")",null,600);
MathJax.Hub.lastPrepError = err; MathJax.Hub.lastPrepError = err;
@ -1899,7 +1905,7 @@ MathJax.Hub.Startup = {
}, },
preProcess: function (element) { preProcess: function (element) {
var load = AJAX.Require(this.directory+"/"+this.JAXFILE); var load = AJAX.Require(this.directory+"/"+this.JAXFILE);
if (!load.called) {this.constructor.prototype.preOutput = function (element) {return load}} if (!load.called) {this.constructor.prototype.preProcess = function (element) {return load}}
return load; return load;
}, },
Translate: function (element) { Translate: function (element) {