Fix workaround for webkit bug in rendering of overlong text nodes

marijnh · marijnh · commit 48c2e8e45403 · 2013-01-21T10:47:06.000+01:00
Issue #1163
diff --git a/lib/codemirror.js b/lib/codemirror.js
@@ -565,7 +565,7 @@ window.CodeMirror = (function() {
         node.style.display = "none";
         node.lineObj = null;
       } else {
-        container.removeChild(node);
+        node.parentNode.removeChild(node);
       }
       return next;
     }
@@ -3697,8 +3697,9 @@ window.CodeMirror = (function() {
     while (!stream.eol()) {
       var style = mode.token(stream, state);
       if (stream.pos > 5000) {
+        flattenSpans = false;
         // Webkit seems to refuse to render text nodes longer than 57444 characters
-        stream.pos = Math.min(text.length, stream.pos + 50000);
+        stream.pos = Math.min(text.length, stream.start + 50000);
         style = null;
       }
       var substr = stream.current();

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ window.CodeMirror = (function() {`
`565`	`565`	`node.style.display = "none";`
`566`	`566`	`node.lineObj = null;`
`567`	`567`	`} else {`
`568`		`- container.removeChild(node);`
	`568`	`+ node.parentNode.removeChild(node);`
`569`	`569`	`}`
`570`	`570`	`return next;`
`571`	`571`	`}`
`@@ -3697,8 +3697,9 @@ window.CodeMirror = (function() {`
`3697`	`3697`	`while (!stream.eol()) {`
`3698`	`3698`	`var style = mode.token(stream, state);`
`3699`	`3699`	`if (stream.pos > 5000) {`
	`3700`	`+ flattenSpans = false;`
`3700`	`3701`	`// Webkit seems to refuse to render text nodes longer than 57444 characters`
`3701`		`- stream.pos = Math.min(text.length, stream.pos + 50000);`
	`3702`	`+ stream.pos = Math.min(text.length, stream.start + 50000);`
`3702`	`3703`	`style = null;`
`3703`	`3704`	`}`
`3704`	`3705`	`var substr = stream.current();`