make sure a window resize causes a full refresh

marijnh · marijnh · commit ef83a9126c34 · 2011-03-08T12:28:05.000+01:00
diff --git a/lib/codemirror.js b/lib/codemirror.js
@@ -76,8 +76,8 @@ var CodeMirror = (function() {
     // Register our event handlers.
     connect(wrapper, "mousedown", operation(onMouseDown));
     connect(code, "dblclick", operation(onDblClick));
-    connect(wrapper, "scroll", function() {updateDisplay(); if (options.onScroll) options.onScroll(instance);});
-    connect(window, "resize", updateDisplay);
+    connect(wrapper, "scroll", function() {updateDisplay([]); if (options.onScroll) options.onScroll(instance);});
+    connect(window, "resize", function() {updateDisplay(true);});
     connect(input, "keyup", operation(onKeyUp));
     connect(input, "keydown", operation(onKeyDown));
     connect(input, "keypress", onKeyPress);
@@ -160,7 +160,7 @@ var CodeMirror = (function() {
       getRange: function(from, to) {return getRange(clipPos(from), clipPos(to));},
 
       operation: function(f){return operation(f)();},
-      refresh: function(){updateDisplay([{from: 0, to: lines.length}]);},
+      refresh: function(){updateDisplay(true);},
       getInputField: function(){return input;},
       getWrapperElement: function(){return wrapper;}
     };
@@ -598,8 +598,8 @@ var CodeMirror = (function() {
       if (!wrapper.clientWidth) return;
       // First create a range of theoretically intact lines, and punch
       // holes in that using the change info.
-      var intact = [{from: showingFrom, to: showingTo, domStart: 0}];
-      for (var i = 0, l = changes ? changes.length : 0; i < l; ++i) {
+      var intact = changes === true ? [] : [{from: showingFrom, to: showingTo, domStart: 0}];
+      for (var i = 0, l = changes.length || 0; i < l; ++i) {
         var change = changes[i], intact2 = [], diff = change.diff || 0;
         for (var j = 0, l2 = intact.length; j < l2; ++j) {
           var range = intact[j];
diff --git a/mode/javascript/index.html b/mode/javascript/index.html
@@ -7,12 +7,12 @@
     <script src="javascript.js"></script>
     <link rel="stylesheet" href="javascript.css">
     <link rel="stylesheet" href="../../docs.css">
-    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black;}</style>
+    <style type="text/css">.CodeMirror {border-top: 1px solid black; border-bottom: 1px solid black; height: auto}</style>
   </head>
   <body>
     <h1>CodeMirror 2: JavaScript mode</h1>
 
-<form><textarea id="code" name="code">
+<div><textarea id="code" name="code">
 // Demo code (the actual new parser character stream implementation)
 
 function StringStream(string) {
@@ -60,7 +60,7 @@ <h1>CodeMirror 2: JavaScript mode</h1>
     }
   }
 };
-</textarea></form>
+</textarea></div>
 
     <script>
       var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
