Skip to content

Commit 541f4fa

Browse files
hermanzdosilovichermanzdosilovic
committed
If text is null, skip markdown rendering
1 parent 28d116b commit 541f4fa

File tree

4 files changed

+79
-76
lines changed

4 files changed

+79
-76
lines changed

‎dist/markjax.js

+26-25
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* markjax v1.1.1
2+
* markjax v1.1.2
33
* Copyright CodeAssign
44
* @link http://markjax.codeassign.com/
55
* @license Apache-2.0
@@ -270,40 +270,41 @@ function renderMathInElement(elem) {
270270
}
271271

272272
function markjax(text, element, markedOptions = {}) {
273-
if (markedOptions["breaks"] === undefined) {
274-
markedOptions["breaks"] = true;
275-
}
276-
if (markedOptions["sanitize"] === undefined) {
277-
markedOptions["sanitize"] = true;
278-
}
279-
if (markedOptions["highlight"] === undefined) {
280-
markedOptions["highlight"] = function (code) {
281-
return highlight.highlightAuto(code).value;
273+
if (text !== null) {
274+
if (markedOptions["breaks"] === undefined) {
275+
markedOptions["breaks"] = true;
276+
}
277+
if (markedOptions["sanitize"] === undefined) {
278+
markedOptions["sanitize"] = true;
279+
}
280+
if (markedOptions["highlight"] === undefined) {
281+
markedOptions["highlight"] = function (code) {
282+
return highlight.highlightAuto(code).value;
283+
}
282284
}
283-
}
284285

285-
marked.setOptions(markedOptions);
286+
marked.setOptions(markedOptions);
286287

287-
var node = document.createElement('div');
288-
var src = text.replace(/&lt;/mg, '<').replace(/&gt;/mg, '>');
289-
290-
var html = ReEscapeTex(marked(EscapeTex(src)));
291-
node.innerHTML = html;
292-
var code = node.getElementsByTagName("code");
288+
var node = document.createElement('div');
289+
var src = text.replace(/&lt;/mg, '<').replace(/&gt;/mg, '>');
290+
291+
var html = ReEscapeTex(marked(EscapeTex(src)));
292+
node.innerHTML = html;
293+
var code = node.getElementsByTagName("code");
293294

294-
for (var i = 0; i < code.length; i++) {
295-
code[i].innerHTML = code[i].innerHTML.replace(/\\\$/g, '$');
296-
}
297-
298-
var elements = node.getElementsByTagName("*");
295+
for (var i = 0; i < code.length; i++) {
296+
code[i].innerHTML = code[i].innerHTML.replace(/\\\$/g, '$');
297+
}
299298

299+
element.innerHTML = node.innerHTML;
300+
}
301+
302+
var elements = element.getElementsByTagName("*");
300303
for (var i = 0; i < elements.length; i++) {
301304
if (elements[i].tagName !== "CODE") {
302305
elements[i].classList.add("mathjax");
303306
}
304307
}
305-
306-
element.innerHTML = node.innerHTML;
307308
renderMathInElement(element);
308309
}
309310

‎dist/markjax.min.js

+27-26
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/**
2-
* markjax v1.1.1
2+
* markjax v1.1.2
33
* Copyright CodeAssign
44
* @link http://markjax.codeassign.com/
55
* @license Apache-2.0
66
*/
77
/**
8-
* markjax v1.1.1
8+
* markjax v1.1.2
99
* Copyright CodeAssign
1010
* @link http://markjax.codeassign.com/
1111
* @license Apache-2.0
@@ -276,40 +276,41 @@ function renderMathInElement(elem) {
276276
}
277277

278278
function markjax(text, element, markedOptions = {}) {
279-
if (markedOptions["breaks"] === undefined) {
280-
markedOptions["breaks"] = true;
281-
}
282-
if (markedOptions["sanitize"] === undefined) {
283-
markedOptions["sanitize"] = true;
284-
}
285-
if (markedOptions["highlight"] === undefined) {
286-
markedOptions["highlight"] = function (code) {
287-
return highlight.highlightAuto(code).value;
279+
if (text !== null) {
280+
if (markedOptions["breaks"] === undefined) {
281+
markedOptions["breaks"] = true;
282+
}
283+
if (markedOptions["sanitize"] === undefined) {
284+
markedOptions["sanitize"] = true;
285+
}
286+
if (markedOptions["highlight"] === undefined) {
287+
markedOptions["highlight"] = function (code) {
288+
return highlight.highlightAuto(code).value;
289+
}
288290
}
289-
}
290291

291-
marked.setOptions(markedOptions);
292+
marked.setOptions(markedOptions);
292293

293-
var node = document.createElement('div');
294-
var src = text.replace(/&lt;/mg, '<').replace(/&gt;/mg, '>');
295-
296-
var html = ReEscapeTex(marked(EscapeTex(src)));
297-
node.innerHTML = html;
298-
var code = node.getElementsByTagName("code");
294+
var node = document.createElement('div');
295+
var src = text.replace(/&lt;/mg, '<').replace(/&gt;/mg, '>');
296+
297+
var html = ReEscapeTex(marked(EscapeTex(src)));
298+
node.innerHTML = html;
299+
var code = node.getElementsByTagName("code");
299300

300-
for (var i = 0; i < code.length; i++) {
301-
code[i].innerHTML = code[i].innerHTML.replace(/\\\$/g, '$');
302-
}
303-
304-
var elements = node.getElementsByTagName("*");
301+
for (var i = 0; i < code.length; i++) {
302+
code[i].innerHTML = code[i].innerHTML.replace(/\\\$/g, '$');
303+
}
305304

305+
element.innerHTML = node.innerHTML;
306+
}
307+
308+
var elements = element.getElementsByTagName("*");
306309
for (var i = 0; i < elements.length; i++) {
307310
if (elements[i].tagName !== "CODE") {
308311
elements[i].classList.add("mathjax");
309312
}
310313
}
311-
312-
element.innerHTML = node.innerHTML;
313314
renderMathInElement(element);
314315
}
315316

‎js/markjax.js

+25-24
Original file line numberDiff line numberDiff line change
@@ -263,40 +263,41 @@ function renderMathInElement(elem) {
263263
}
264264

265265
function markjax(text, element, markedOptions = {}) {
266-
if (markedOptions["breaks"] === undefined) {
267-
markedOptions["breaks"] = true;
268-
}
269-
if (markedOptions["sanitize"] === undefined) {
270-
markedOptions["sanitize"] = true;
271-
}
272-
if (markedOptions["highlight"] === undefined) {
273-
markedOptions["highlight"] = function (code) {
274-
return highlight.highlightAuto(code).value;
266+
if (text !== null) {
267+
if (markedOptions["breaks"] === undefined) {
268+
markedOptions["breaks"] = true;
269+
}
270+
if (markedOptions["sanitize"] === undefined) {
271+
markedOptions["sanitize"] = true;
272+
}
273+
if (markedOptions["highlight"] === undefined) {
274+
markedOptions["highlight"] = function (code) {
275+
return highlight.highlightAuto(code).value;
276+
}
275277
}
276-
}
277278

278-
marked.setOptions(markedOptions);
279+
marked.setOptions(markedOptions);
279280

280-
var node = document.createElement('div');
281-
var src = text.replace(/&lt;/mg, '<').replace(/&gt;/mg, '>');
282-
283-
var html = ReEscapeTex(marked(EscapeTex(src)));
284-
node.innerHTML = html;
285-
var code = node.getElementsByTagName("code");
281+
var node = document.createElement('div');
282+
var src = text.replace(/&lt;/mg, '<').replace(/&gt;/mg, '>');
283+
284+
var html = ReEscapeTex(marked(EscapeTex(src)));
285+
node.innerHTML = html;
286+
var code = node.getElementsByTagName("code");
286287

287-
for (var i = 0; i < code.length; i++) {
288-
code[i].innerHTML = code[i].innerHTML.replace(/\\\$/g, '$');
289-
}
290-
291-
var elements = node.getElementsByTagName("*");
288+
for (var i = 0; i < code.length; i++) {
289+
code[i].innerHTML = code[i].innerHTML.replace(/\\\$/g, '$');
290+
}
292291

292+
element.innerHTML = node.innerHTML;
293+
}
294+
295+
var elements = element.getElementsByTagName("*");
293296
for (var i = 0; i < elements.length; i++) {
294297
if (elements[i].tagName !== "CODE") {
295298
elements[i].classList.add("mathjax");
296299
}
297300
}
298-
299-
element.innerHTML = node.innerHTML;
300301
renderMathInElement(element);
301302
}
302303

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "markjax",
3-
"version": "1.1.1",
3+
"version": "1.1.2",
44
"description": "Javascript parser for converting Markdown with LaTeX to HTML",
55
"keywords": [
66
"parser",

0 commit comments

Comments
 (0)