mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-24 17:36:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'develop' of github.com:ether/etherpad-lite into update-connect

Browse source
This commit is contained in:
John McLear 2013-04-15 19:07:01 +01:00
commit 9b952da692
3 changed files with 4 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/static/js/Changeset.js
View file

@ -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