Prevent IE error when initializing w/ lineWrap wo/ scrollbar

marijnh · marijnh · commit f4f023aea431 · 2012-07-22T22:47:12.000+02:00
diff --git a/lib/codemirror.js b/lib/codemirror.js
@@ -1141,7 +1141,7 @@ var CodeMirror = (function() {
         var shouldHaveScrollbar = scrollHeight ? "block" : "none";
         if (scrollbar.style.display != shouldHaveScrollbar) {
           scrollbar.style.display = shouldHaveScrollbar;
-          scrollbarInner.style.height = scrollHeight + "px";
+          if (scrollHeight) scrollbarInner.style.height = scrollHeight + "px";
           checkHeights();
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -1141,7 +1141,7 @@ var CodeMirror = (function() {`
`1141`	`1141`	`var shouldHaveScrollbar = scrollHeight ? "block" : "none";`
`1142`	`1142`	`if (scrollbar.style.display != shouldHaveScrollbar) {`
`1143`	`1143`	`scrollbar.style.display = shouldHaveScrollbar;`
`1144`		`- scrollbarInner.style.height = scrollHeight + "px";`
	`1144`	`+ if (scrollHeight) scrollbarInner.style.height = scrollHeight + "px";`
`1145`	`1145`	`checkHeights();`
`1146`	`1146`	`}`
`1147`	`1147`	`}`