summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn McLear <john@mclear.co.uk>2014-11-04 15:50:53 +0000
committerJohn McLear <john@mclear.co.uk>2014-11-04 15:50:53 +0000
commitb59f6a4d6f6a33824ea0caf3b668b635bbfb0823 (patch)
tree58a73fc8de2051a5e5ddb807b8374b897513f2b7 /src
parentb61d8d99d17833d9fb45d21e9fb213ae59acd9f1 (diff)
downloadetherpad-lite-b59f6a4d6f6a33824ea0caf3b668b635bbfb0823.zip
Update ace2_inner.js
Diffstat (limited to 'src')
-rw-r--r--src/static/js/ace2_inner.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index fb6dd080..4ef0a087 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -3816,7 +3816,7 @@ function Ace2Inner(){
}
updateBrowserSelectionFromRep();
var myselection = document.getSelection(); // get the current caret selection, can't use rep. here because that only gives us the start position not the current
- var caretOffsetTop = myselection.focusNode.parentNode.offsetTop | myselection.focusNode.offsetTop; // get the carets selection offset in px IE 214
+ var caretOffsetTop = myselection.focusNode.parentNode.offsetTop || myselection.focusNode.offsetTop; // get the carets selection offset in px IE 214
// top.console.log(caretOffsetTop);
setScrollY(caretOffsetTop); // set the scrollY offset of the viewport on the document