mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-04-28 03:16:16 -04:00
cleanup
This commit is contained in:
parent
3b3ec6d288
commit
dcb061fb1b
7 changed files with 8 additions and 22 deletions
|
@ -1,8 +1,6 @@
|
||||||
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
|
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
|
||||||
var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
|
var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
|
||||||
var helper = require("./helper.js")
|
var helper = require("./helper.js")
|
||||||
var assert = helper.assert;
|
|
||||||
var literal = helper.literal;
|
|
||||||
var assertEqualStrings = helper.assertEqualStrings;
|
var assertEqualStrings = helper.assertEqualStrings;
|
||||||
var assertEqualArrays = helper.assertEqualArrays;
|
var assertEqualArrays = helper.assertEqualArrays;
|
||||||
|
|
||||||
|
|
|
@ -123,12 +123,12 @@ function random() {
|
||||||
outTextAssem.append(txt);
|
outTextAssem.append(txt);
|
||||||
appendMultilineOp('+', txt);
|
appendMultilineOp('+', txt);
|
||||||
} else if (o.skip) {
|
} else if (o.skip) {
|
||||||
var txt = textLeft.substring(0, o.skip);
|
txt = textLeft.substring(0, o.skip);
|
||||||
textLeft = textLeft.substring(o.skip);
|
textLeft = textLeft.substring(o.skip);
|
||||||
outTextAssem.append(txt);
|
outTextAssem.append(txt);
|
||||||
appendMultilineOp('=', txt);
|
appendMultilineOp('=', txt);
|
||||||
} else if (o.remove) {
|
} else if (o.remove) {
|
||||||
var txt = textLeft.substring(0, o.remove);
|
txt = textLeft.substring(0, o.remove);
|
||||||
textLeft = textLeft.substring(o.remove);
|
textLeft = textLeft.substring(o.remove);
|
||||||
appendMultilineOp('-', txt);
|
appendMultilineOp('-', txt);
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,8 +26,7 @@ describe("follow",function(){
|
||||||
|
|
||||||
})
|
})
|
||||||
function testCharacterRangeFollow(testId, cs, oldRange, insertionsAfter, correctNewRange) {
|
function testCharacterRangeFollow(testId, cs, oldRange, insertionsAfter, correctNewRange) {
|
||||||
|
cs = Changeset.checkRep(cs);
|
||||||
var cs = Changeset.checkRep(cs);
|
|
||||||
assertEqualArrays(correctNewRange, Changeset.characterRangeFollow(cs, oldRange[0], oldRange[1], insertionsAfter));
|
assertEqualArrays(correctNewRange, Changeset.characterRangeFollow(cs, oldRange[0], oldRange[1], insertionsAfter));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -121,12 +120,12 @@ function random() {
|
||||||
outTextAssem.append(txt);
|
outTextAssem.append(txt);
|
||||||
appendMultilineOp('+', txt);
|
appendMultilineOp('+', txt);
|
||||||
} else if (o.skip) {
|
} else if (o.skip) {
|
||||||
var txt = textLeft.substring(0, o.skip);
|
txt = textLeft.substring(0, o.skip);
|
||||||
textLeft = textLeft.substring(o.skip);
|
textLeft = textLeft.substring(o.skip);
|
||||||
outTextAssem.append(txt);
|
outTextAssem.append(txt);
|
||||||
appendMultilineOp('=', txt);
|
appendMultilineOp('=', txt);
|
||||||
} else if (o.remove) {
|
} else if (o.remove) {
|
||||||
var txt = textLeft.substring(0, o.remove);
|
txt = textLeft.substring(0, o.remove);
|
||||||
textLeft = textLeft.substring(o.remove);
|
textLeft = textLeft.substring(o.remove);
|
||||||
appendMultilineOp('-', txt);
|
appendMultilineOp('-', txt);
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,7 @@
|
||||||
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
|
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
|
||||||
var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
|
var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
|
||||||
var helper = require("./helper.js")
|
var helper = require("./helper.js")
|
||||||
var assertEqualStrings = helper.assertEqualStrings;
|
|
||||||
var assertEqualArrays = helper.assertEqualArrays;
|
var assertEqualArrays = helper.assertEqualArrays;
|
||||||
var assert = helper.assert;
|
|
||||||
|
|
||||||
describe("inverseRandom",function(){
|
describe("inverseRandom",function(){
|
||||||
it("inverseRandom",function(done){
|
it("inverseRandom",function(done){
|
||||||
|
@ -135,12 +133,12 @@ function random() {
|
||||||
outTextAssem.append(txt);
|
outTextAssem.append(txt);
|
||||||
appendMultilineOp('+', txt);
|
appendMultilineOp('+', txt);
|
||||||
} else if (o.skip) {
|
} else if (o.skip) {
|
||||||
var txt = textLeft.substring(0, o.skip);
|
txt = textLeft.substring(0, o.skip);
|
||||||
textLeft = textLeft.substring(o.skip);
|
textLeft = textLeft.substring(o.skip);
|
||||||
outTextAssem.append(txt);
|
outTextAssem.append(txt);
|
||||||
appendMultilineOp('=', txt);
|
appendMultilineOp('=', txt);
|
||||||
} else if (o.remove) {
|
} else if (o.remove) {
|
||||||
var txt = textLeft.substring(0, o.remove);
|
txt = textLeft.substring(0, o.remove);
|
||||||
textLeft = textLeft.substring(o.remove);
|
textLeft = textLeft.substring(o.remove);
|
||||||
appendMultilineOp('-', txt);
|
appendMultilineOp('-', txt);
|
||||||
}
|
}
|
||||||
|
@ -273,7 +271,4 @@ function random() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function assertEqualArrays(a, b) {
|
|
||||||
assert("JSON.stringify(" + literal(a) + ") == JSON.stringify(" + literal(b) + ")");
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -1,9 +1,6 @@
|
||||||
|
|
||||||
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
|
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
|
||||||
var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
|
|
||||||
var helper = require("./helper.js")
|
var helper = require("./helper.js")
|
||||||
var assertEqualStrings = helper.assertEqualStrings;
|
var assertEqualStrings = helper.assertEqualStrings;
|
||||||
var assertEqualArrays = helper.assertEqualArrays;
|
|
||||||
|
|
||||||
describe("testAppendATextToAssembler",function(){
|
describe("testAppendATextToAssembler",function(){
|
||||||
it("testAppendATextToAssembler",function(done){
|
it("testAppendATextToAssembler",function(done){
|
||||||
|
|
|
@ -1,7 +1,4 @@
|
||||||
|
|
||||||
|
|
||||||
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
|
var Changeset = require("ep_etherpad-lite/static/js/Changeset");
|
||||||
var AttributePool = require("ep_etherpad-lite/static/js/AttributePool");
|
|
||||||
var helper = require("./helper.js")
|
var helper = require("./helper.js")
|
||||||
var assertEqualStrings = helper.assertEqualStrings;
|
var assertEqualStrings = helper.assertEqualStrings;
|
||||||
var assertEqualArrays = helper.assertEqualArrays;
|
var assertEqualArrays = helper.assertEqualArrays;
|
||||||
|
|
|
@ -231,7 +231,7 @@ function runMutationTest(origLines, muts) {
|
||||||
|
|
||||||
var inText = origLines.join('');
|
var inText = origLines.join('');
|
||||||
var cs = mutationsToChangeset(inText.length, muts);
|
var cs = mutationsToChangeset(inText.length, muts);
|
||||||
lines2 = origLines.slice();
|
var lines2 = origLines.slice();
|
||||||
Changeset.mutateTextLines(cs, lines2);
|
Changeset.mutateTextLines(cs, lines2);
|
||||||
|
|
||||||
var outText = Changeset.applyToText(cs, inText);
|
var outText = Changeset.applyToText(cs, inText);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue