From f7f8c901f4bc39c3ed0a2bdfe1cbaa1ee6957999 Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Mon, 1 Jun 2015 18:04:25 +0800
Subject: Marked as 0.2.9

---
 public/vendor/codemirror/lib/codemirror.js | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

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

diff --git a/public/vendor/codemirror/lib/codemirror.js b/public/vendor/codemirror/lib/codemirror.js
index a78ebdf5..1db591f9 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,
+      scrollHeight: docH + scrollGap(cm) + d.barHeight + textHeight(cm.display),
       nativeBarWidth: d.nativeBarWidth,
       gutterWidth: gutterW
     };
@@ -2287,9 +2287,13 @@
     }
       
     $('.other-cursor').each(function(key, value) {
-        var coord = cm.charCoords({line:$(value).attr('data-line'), ch:$(value).attr('data-ch')}, 'windows');
-        $(value)[0].style.left = coord.left + 'px';
-        $(value)[0].style.top = coord.top + 'px';
+        var line = parseInt($(value).attr('data-line'));
+        var ch = parseInt($(value).attr('data-ch'));
+        var offsetLeft = parseFloat($(value).attr('data-offset-left'));
+        var offsetTop = parseFloat($(value).attr('data-offset-top'));
+        var coord = cm.charCoords({line: line, ch: ch}, 'windows');
+        $(value)[0].style.left = coord.left + offsetLeft + 'px';
+        $(value)[0].style.top = coord.top + offsetTop + 'px';
     });
   }
 
-- 
cgit v1.2.3