summaryrefslogtreecommitdiff
path: root/public/vendor/codemirror/addon/scroll
diff options
context:
space:
mode:
Diffstat (limited to 'public/vendor/codemirror/addon/scroll')
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/addon/scroll/annotatescrollbar.js5
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/addon/scroll/scrollpastend.js0
-rw-r--r--[-rwxr-xr-x]public/vendor/codemirror/addon/scroll/simplescrollbars.js0
3 files changed, 4 insertions, 1 deletions
diff --git a/public/vendor/codemirror/addon/scroll/annotatescrollbar.js b/public/vendor/codemirror/addon/scroll/annotatescrollbar.js
index bbbfa59c..3f80f483 100755..100644
--- 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
index 008ae4c7..008ae4c7 100755..100644
--- a/public/vendor/codemirror/addon/scroll/scrollpastend.js
+++ b/public/vendor/codemirror/addon/scroll/scrollpastend.js
diff --git a/public/vendor/codemirror/addon/scroll/simplescrollbars.js b/public/vendor/codemirror/addon/scroll/simplescrollbars.js
index f78353a1..f78353a1 100755..100644
--- a/public/vendor/codemirror/addon/scroll/simplescrollbars.js
+++ b/public/vendor/codemirror/addon/scroll/simplescrollbars.js