diff --git a/.travis.yml b/.travis.yml index 77f0c8557..9060d94f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: node_js node_js: - - "0.8" + - "0.10" install: - "bin/installDeps.sh" - "export GIT_HASH=$(cat .git/HEAD | head -c 7)" @@ -11,12 +11,13 @@ script: env: global: - secure: "OxZ2s724S96xu02746LUN+4lBckAe1BOICJjfA4jnFPNpiNU6XoMH52f+LgG\nZzAwu6xMTv+NsaLGp6Avm3cx4GZ+jIiHe4NB9XOgYPa0r0TBIi3ueWYPDyVv\nCniS/4qX68DoFNV4lh7zMBXn0IIPxT4Wppm3desBpjWDP/SdoRs=" - - SAUCE_USER=pita + - SAUCE_USER=etherpad jdk: - oraclejdk6 notifications: email: - petermartischka@googlemail.com + - contact@etherpad.org irc: channels: - - "irc.freenode.org#etherpad-lite-dev" \ No newline at end of file + - "irc.freenode.org#etherpad-lite-dev" diff --git a/CHANGELOG.md b/CHANGELOG.md index 513a93b79..8abebf814 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,6 @@ * Fix: Import browser detection * Fix: 2 Part Locale Specs * Fix: Remove language string from chat element - * Fix: Temporary patch for Changeset Spam * Fix: Make Saved revision Star fade back out on non Top frames * Other: Remove some cruft legacy JS from old Etherpad * Other: Express 3.1.2 breaks sessions, set Express to 3.1.0 diff --git a/src/static/js/Changeset.js b/src/static/js/Changeset.js index 89ac5d750..b16042126 100644 --- a/src/static/js/Changeset.js +++ b/src/static/js/Changeset.js @@ -1663,16 +1663,9 @@ exports.appendATextToAssembler = function (atext, assem) { * @param cs {Changeset} * @param pool {AtributePool} */ -var lastEvent = null; // This is just a temporary measure to ensure we don't send the exact same changeset twice -// Documentation for this is available at https://github.com/ether/etherpad-lite/issues/1652 - exports.prepareForWire = function (cs, pool) { - if(cs == lastEvent){ - throw new Error("Not sending the same event twice..."); - } var newPool = new AttributePool(); var newCs = exports.moveOpsToNewPool(cs, pool, newPool); - lastEvent = cs; return { translated: newCs, pool: newPool