mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-27 02:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Try fixing #2107 by removing checkRep

Browse source
This commit is contained in:
Marcel Klehr 2014-04-25 23:54:22 +02:00
parent 20c32de5e7
commit ed25ffb025
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/static/js/ace2_inner.js
View file

@ -742,8 +742,8 @@ function Ace2Inner(){
assem.append(o); assem.append(o);
Changeset.appendATextToAssembler(atext, assem); Changeset.appendATextToAssembler(atext, assem);
var newLen = oldLen + assem.getLengthChange(); var newLen = oldLen + assem.getLengthChange();
var changeset = Changeset.checkRep( var changeset = Changeset.pack(oldLen, newLen, assem.toString(), atext.text.slice(0, -1));
Changeset.pack(oldLen, newLen, assem.toString(), atext.text.slice(0, -1))); // changeset = Changeset.checkRep(changeset)
performDocumentApplyChangeset(changeset); performDocumentApplyChangeset(changeset);
performSelectionChange([0, rep.lines.atIndex(0).lineMarker], [0, rep.lines.atIndex(0).lineMarker]); performSelectionChange([0, rep.lines.atIndex(0).lineMarker], [0, rep.lines.atIndex(0).lineMarker]);
@ -2333,7 +2333,7 @@ function Ace2Inner(){
if(rep.selStart[1] == rep.selEnd[1] && rep.selStart[1] == rep.lines.atIndex(n).text.length){ if(rep.selStart[1] == rep.selEnd[1] && rep.selStart[1] == rep.lines.atIndex(n).text.length){
return false; // If we're at the end of a line we treat it as having no formatting return false; // If we're at the end of a line we treat it as having no formatting
} }
if(rep.selStart[1] == 0 && rep.selEnd[1] == 0){ if(rep.selStart[1] == 0 && rep.selEnd[1] == 0){
rep.selEnd[1] == 1; rep.selEnd[1] == 1;
} }
if(rep.selEnd[1] == -1){ if(rep.selEnd[1] == -1){
@ -3818,7 +3818,7 @@ function Ace2Inner(){
// top.console.log(caretOffsetTop, viewport.top, caretOffsetTopBottom, viewport.bottom); // top.console.log(caretOffsetTop, viewport.top, caretOffsetTopBottom, viewport.bottom);
var caretIsNotVisible = (caretOffsetTop < viewport.top || caretOffsetTopBottom >= viewport.bottom); // Is the Caret Visible to the user? var caretIsNotVisible = (caretOffsetTop < viewport.top || caretOffsetTopBottom >= viewport.bottom); // Is the Caret Visible to the user?
// Expect some weird behavior caretOffsetTopBottom is greater than viewport.bottom on a keypress down // Expect some weird behavior caretOffsetTopBottom is greater than viewport.bottom on a keypress down
var offsetTopSamePlace = caretOffsetTop == viewport.top; // sometimes moving key left & up leaves the caret at the same point as the viewport.top, technically the caret is visible but it's not fully visible so we should move to it var offsetTopSamePlace = caretOffsetTop == viewport.top; // sometimes moving key left & up leaves the caret at the same point as the viewport.top, technically the caret is visible but it's not fully visible so we should move to it
if(offsetTopSamePlace && (evt.which == 37 || evt.which == 38)){ if(offsetTopSamePlace && (evt.which == 37 || evt.which == 38)){
var newY = caretOffsetTop; var newY = caretOffsetTop;
setScrollY(newY); setScrollY(newY);