diff --git a/lib/codemirror.js b/lib/codemirror.js
index b33cfcd53bed0d37ca55df716fed90cebd2bb59f..ade51e52e21069f316a79227db1314fe6487b1de 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -61,8 +61,7 @@ var CodeMirror = (function() {
     // to always show scrollbars, the scrollbar shouldn't overlap.)
     if (mac_geLion) {
       scrollbar.className += (overlapScrollbars() ? " cm-sb-overlap" : " cm-sb-nonoverlap");
-    }
-    else if (ie_lt8) {
+    } else if (ie_lt8) {
       // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
       scrollbar.className += " cm-sb-ie7";
     }
@@ -504,8 +503,7 @@ var CodeMirror = (function() {
         }
         var n = files.length, text = Array(n), read = 0;
         for (var i = 0; i < n; ++i) loadFile(files[i], i);
-      }
-      else {
+      } else {
         // Don't do a replace if the drop happened inside of the selected text.
         if (draggingText && !(posLess(pos, sel.from) || posLess(sel.to, pos))) return;
         try {
@@ -676,12 +674,10 @@ var CodeMirror = (function() {
         var delta = -e.detail * 8.0;
         if (e.axis == e.HORIZONTAL_AXIS) deltaX = delta;
         else if (e.axis == e.VERTICAL_AXIS) deltaY = delta;
-      }
-      else if (e.wheelDeltaX !== undefined && e.wheelDeltaY !== undefined) { // WebKit
+      } else if (e.wheelDeltaX !== undefined && e.wheelDeltaY !== undefined) { // WebKit
         deltaX = e.wheelDeltaX / 3.0;
         deltaY = e.wheelDeltaY / 3.0;
-      }
-      else if (e.wheelDelta !== undefined) { // IE or Opera
+      } else if (e.wheelDelta !== undefined) { // IE or Opera
         deltaY = e.wheelDelta / 3.0;
       }
 
@@ -1005,8 +1001,7 @@ var CodeMirror = (function() {
       if (x1 < screenleft + gutterw || atLeft) {
         if (atLeft) x1 = 0;
         result.scrollLeft = Math.max(0, x1 - 10 - gutterw);
-      }
-      else if (x2 > screenw + screenleft - 3) {
+      } else if (x2 > screenw + screenleft - 3) {
         result.scrollLeft = x2 + 10 - screenw;
       }
       return result;
@@ -1440,8 +1435,7 @@ var CodeMirror = (function() {
       if (!diff) {
         if (sel.from.line != n && sel.to.line != n) return;
         var indentString = curSpaceString;
-      }
-      else {
+      } else {
         var indentString = "", pos = 0;
         if (options.indentWithTabs)
           for (var i = Math.floor(indentation / options.tabSize); i; --i) {pos += options.tabSize; indentString += "\t";}
@@ -1609,8 +1603,7 @@ var CodeMirror = (function() {
             var l = line.text;
             if (hidden && l.length == maxLine.length) {
               maxLengthChanged = true;
-            }
-            else if (!hidden && l.length > maxLine.length) {
+            } else if (!hidden && l.length > maxLine.length) {
               maxLine = l; maxWidth = null;
               maxLengthChanged = false;
             }
@@ -1635,8 +1628,7 @@ var CodeMirror = (function() {
         var n = line;
         line = getLine(line);
         if (!line) return null;
-      }
-      else {
+      } else {
         var n = lineNo(line);
         if (n == null) return null;
       }
@@ -2331,8 +2323,7 @@ var CodeMirror = (function() {
           if (consume !== false) this.pos += pattern.length;
           return true;
         }
-      }
-      else {
+      } else {
         var match = this.string.slice(this.pos).match(pattern);
         if (match && consume !== false) this.pos += match[0].length;
         return match;
@@ -2693,8 +2684,7 @@ var CodeMirror = (function() {
       if (state == 0) {
         if (end > from) dest.push(part.slice(from - pos, Math.min(part.length, to - pos)), source[i+1]);
         if (end >= from) state = 1;
-      }
-      else if (state == 1) {
+      } else if (state == 1) {
         if (end > to) dest.push(part.slice(0, to - pos), source[i+1]);
         else dest.push(part, source[i+1]);
       }
@@ -2969,8 +2959,7 @@ var CodeMirror = (function() {
     if (typeof node.addEventListener == "function") {
       node.addEventListener(type, handler, false);
       if (disconnect) return function() {node.removeEventListener(type, handler, false);};
-    }
-    else {
+    } else {
       var wrapHandler = function(event) {handler(event || window.event);};
       node.attachEvent("on" + type, wrapHandler);
       if (disconnect) return function() {node.detachEvent("on" + type, wrapHandler);};
@@ -3102,18 +3091,19 @@ var CodeMirror = (function() {
   }
   // Recent (late 2011) Opera betas insert bogus newlines at the start
   // of the textContent, so we strip those.
-  if (htmlEscape("a") == "\na")
+  if (htmlEscape("a") == "\na") {
     htmlEscape = function(str) {
       escapeElement.textContent = str;
       return escapeElement.innerHTML.slice(1);
     };
   // Some IEs don't preserve tabs through innerHTML
-  else if (htmlEscape("\t") != "\t")
+  } else if (htmlEscape("\t") != "\t") {
     htmlEscape = function(str) {
       escapeElement.innerHTML = "";
       escapeElement.appendChild(document.createTextNode(str));
       return escapeElement.innerHTML;
     };
+  }
   CodeMirror.htmlEscape = htmlEscape;
 
   // Used to position the cursor after an undo/redo by finding the