Core: Fixed null reference (#2106)

The new defer logic in Prism Core did not handle that the script element might be null.
PrismJS · Nov 1, 2019 · 0fd062d · 0fd062d
1 parent 631f1e3
commit 0fd062d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/components/prism-core.js b/components/prism-core.js
@@ -593,7 +593,7 @@ if (!_.manual) {
 	// been loaded when Prism.highlightAll() is executed, depending on how fast resources are loaded.
 	// See https://github.com/PrismJS/prism/issues/2102
 	var readyState = document.readyState;
-	if (readyState === 'loading' || readyState === 'interactive' && script.defer) {
+	if (readyState === 'loading' || readyState === 'interactive' && script && script.defer) {
 		document.addEventListener('DOMContentLoaded', highlightAutomaticallyCallback);
 	} else {
 		if (window.requestAnimationFrame) {

diff --git a/components/prism-core.min.js b/components/prism-core.min.js
diff --git a/prism.js b/prism.js
@@ -598,7 +598,7 @@ if (!_.manual) {
 	// been loaded when Prism.highlightAll() is executed, depending on how fast resources are loaded.
 	// See https://github.com/PrismJS/prism/issues/2102
 	var readyState = document.readyState;
-	if (readyState === 'loading' || readyState === 'interactive' && script.defer) {
+	if (readyState === 'loading' || readyState === 'interactive' && script && script.defer) {
 		document.addEventListener('DOMContentLoaded', highlightAutomaticallyCallback);
 	} else {
 		if (window.requestAnimationFrame) {