public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update pad clients

pull/2300/head
Cristo 2014-11-12 19:46:50 +01:00
parent 46bc328896
commit 9d39c9591a
1 changed files with 88 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/node/db/API.js
View File

@ -586,6 +586,7 @@ exports.deletePad = function(padID, callback)
exports.restoreRevision = function (padID, rev, callback) exports.restoreRevision = function (padID, rev, callback)
{ {
var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var Changeset = require("ep_etherpad-lite/static/js/Changeset");
var padMessage = require("ep_etherpad-lite/node/handler/PadMessageHandler.js");
//check if rev is a number //check if rev is a number
if (rev !== undefined && typeof rev != "number") if (rev !== undefined && typeof rev != "number")
@ -663,9 +664,11 @@ exports.restoreRevision = function(padID, rev, callback)
}); });
var lastNewlinePos = oldText.lastIndexOf('\n'); var lastNewlinePos = oldText.lastIndexOf('\n');
if (lastNewlinePos < 0) { if (lastNewlinePos < 0)
{
builder.remove(oldText.length - 1, 0); builder.remove(oldText.length - 1, 0);
} else { } else
{
builder.remove(lastNewlinePos, oldText.match(/\n/g).length - 1); builder.remove(lastNewlinePos, oldText.match(/\n/g).length - 1);
builder.remove(oldText.length - lastNewlinePos - 1, 0); builder.remove(oldText.length - lastNewlinePos - 1, 0);
} }
@ -675,6 +678,9 @@ exports.restoreRevision = function(padID, rev, callback)
//append the changeset //append the changeset
pad.appendRevision(changeset); pad.appendRevision(changeset);
// //
padMessage.updatePadClients(pad, function ()
{
});
callback(null, null); callback(null, null);
}); });