From 6e40df288786f03b634ceae0d03c3b5b3ad43660 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Thu, 24 Sep 2015 13:57:10 +0800
Subject: Updated codemirror to support panel and match-highlighter and revert
 some unnecessary changes

---
 public/vendor/codemirror/lib/codemirror.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'public/vendor/codemirror/lib/codemirror.js')

diff --git a/public/vendor/codemirror/lib/codemirror.js b/public/vendor/codemirror/lib/codemirror.js
index 7ba4ffe4..92cacf0f 100755
--- a/public/vendor/codemirror/lib/codemirror.js
+++ b/public/vendor/codemirror/lib/codemirror.js
@@ -388,7 +388,7 @@
       viewWidth: d.wrapper.clientWidth,
       barLeft: cm.options.fixedGutter ? gutterW : 0,
       docHeight: docH,
-      scrollHeight: docH + scrollGap(cm) + d.barHeight + textHeight(cm.display),
+      scrollHeight: docH + scrollGap(cm) + d.barHeight,
       nativeBarWidth: d.nativeBarWidth,
       gutterWidth: gutterW
     };
-- 
cgit v1.2.3