Merge pull request #9 from wcoder/dev

Improvement loading process. Issue #8
wcoder · Feb 26, 2016 · 447f9a2 · 447f9a2
2 parents 9a3553a + b5dac3d
commit 447f9a2
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/dist/highlightjs-line-numbers.min.js b/dist/highlightjs-line-numbers.min.js
diff --git a/src/highlightjs-line-numbers.js b/src/highlightjs-line-numbers.js
@@ -9,19 +9,25 @@
 	}
 
 	function initLineNumbersOnLoad () {
-		w.addEventListener('load', function () {
-			try {
-				var blocks = document.querySelectorAll('code.hljs');
-
-				for (var i in blocks) {
-					if (blocks.hasOwnProperty(i)) {
-						lineNumbersBlock(blocks[i]);
-					}
+		if (document.readyState === 'complete') {
+			documentReady();
+		} else {
+			w.addEventListener('DOMContentLoaded', documentReady);
+		}
+	}
+
+	function documentReady () {
+		try {
+			var blocks = document.querySelectorAll('code.hljs');
+
+			for (var i in blocks) {
+				if (blocks.hasOwnProperty(i)) {
+					lineNumbersBlock(blocks[i]);
 				}
-			} catch (e) {
-				console.error('LineNumbers error: ', e);
 			}
-		});
+		} catch (e) {
+			console.error('LineNumbers error: ', e);
+		}
 	}
 
 	function lineNumbersBlock (element) {