From eaa8ccaccb1091820d0a8d1223996a6dd057347d Mon Sep 17 00:00:00 2001
From: Wu Cheng-Han
Date: Sun, 17 Jan 2016 14:28:04 -0600
Subject: Upgrade CodeMirror to 5.10.1 and now support fullscreen, jump-to-line
 in editor

---
 public/vendor/codemirror/addon/scroll/annotatescrollbar.js | 5 ++++-
 public/vendor/codemirror/addon/scroll/scrollpastend.js     | 0
 public/vendor/codemirror/addon/scroll/simplescrollbars.js  | 0
 3 files changed, 4 insertions(+), 1 deletion(-)
 mode change 100755 => 100644 public/vendor/codemirror/addon/scroll/annotatescrollbar.js
 mode change 100755 => 100644 public/vendor/codemirror/addon/scroll/scrollpastend.js
 mode change 100755 => 100644 public/vendor/codemirror/addon/scroll/simplescrollbars.js

(limited to 'public/vendor/codemirror/addon/scroll')

diff --git a/public/vendor/codemirror/addon/scroll/annotatescrollbar.js b/public/vendor/codemirror/addon/scroll/annotatescrollbar.js
old mode 100755
new mode 100644
index bbbfa59c..3f80f483
--- a/public/vendor/codemirror/addon/scroll/annotatescrollbar.js
+++ b/public/vendor/codemirror/addon/scroll/annotatescrollbar.js
@@ -51,7 +51,7 @@
   Annotation.prototype.computeScale = function() {
     var cm = this.cm;
     var hScale = (cm.getWrapperElement().clientHeight - cm.display.barHeight - this.buttonHeight * 2) /
-      cm.heightAtLine(cm.lastLine() + 1, "local");
+      cm.getScrollerElement().scrollHeight
     if (hScale != this.hScale) {
       this.hScale = hScale;
       return true;
@@ -100,6 +100,9 @@
       elt.style.cssText = "position: absolute; right: 0px; width: " + Math.max(cm.display.barWidth * 1.5, 2) + "px; top: "
         + (top + this.buttonHeight) + "px; height: " + height + "px";
       elt.className = this.options.className;
+      if (ann.id) {
+        elt.setAttribute("annotation-id", ann.id);
+      }
     }
     this.div.textContent = "";
     this.div.appendChild(frag);
diff --git a/public/vendor/codemirror/addon/scroll/scrollpastend.js b/public/vendor/codemirror/addon/scroll/scrollpastend.js
old mode 100755
new mode 100644
diff --git a/public/vendor/codemirror/addon/scroll/simplescrollbars.js b/public/vendor/codemirror/addon/scroll/simplescrollbars.js
old mode 100755
new mode 100644
-- 
cgit v1.2.3