Merge branch 'vai0-master' into dev

wcoder · wcoder · commit d7c52cd81010 · 2018-09-27T22:07:17.000+03:00
# Conflicts:
#	dist/highlightjs-line-numbers.min.js
diff --git a/src/highlightjs-line-numbers.js b/src/highlightjs-line-numbers.js
@@ -36,7 +36,7 @@
     }
 
     function initLineNumbersOnLoad (options) {
-        if (d.readyState === 'complete') {
+        if (d.readyState === 'interactive' || d.readyState === 'complete') {
             documentReady(options);
         } else {
             w.addEventListener('DOMContentLoaded', function () {

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`function initLineNumbersOnLoad (options) {`
`39`		`- if (d.readyState === 'complete') {`
	`39`	`+ if (d.readyState === 'interactive' \|\| d.readyState === 'complete') {`
`40`	`40`	`documentReady(options);`
`41`	`41`	`} else {`
`42`	`42`	`w.addEventListener('DOMContentLoaded', function () {`