mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-28 11:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Cleanup cruft. Start wiring things up

Browse source
This commit is contained in:
s1341 2013-12-13 11:59:17 +02:00
parent 360bb55dac
commit 11146ce1cd
4 changed files with 40 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

79
src/static/js/revisioncache.js
View file

@ -1,9 +1,3 @@
/**
* This code is mostly from the old Etherpad. Please help us to comment this code.
* This helps other people to understand this code better and helps them to improve it.
* TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
*/
/**
* Copyright 2009 Google Inc.
*
@ -19,12 +13,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
// revision info is a skip list whos entries represent a particular revision
// of the document. These revisions are connected together by various
// changesets, or deltas, between any two revisions.
//require('./jquery.class');
require('./jquery.class');
var libchangeset = require("./Changeset");
$.Class("Changeset",
{//statics
@ -39,6 +29,17 @@ $.Class("Changeset",
getValue: function () {
return this.value;
},
/**
* Apply this changeset to the passed pad.
* @param {PadClient} pad - The pad to apply the changeset to.
*/
apply: function (pad) {
// must mutate attribution lines before text lines
libchangeset.mutateAttributionLines(this.value, pad.alines, pad.apool);
// Looks like this function can take a regular array of strings
libchangeset.mutateTextLines(this.value, /* padcontents */ /*this.lines */ pad.divs);
},
/**
* 'Follow' the Changeset in a given direction, returning the revision at
* the specified end of the edge.
@ -52,33 +53,6 @@ $.Class("Changeset",
}
);
//TODO: cruft! remove?
$.Class("DirectionalIterator",
{//statics
},
{//instance
init: function (list, direction) {
self.list = list;
self.direction = direction;
self.current = self.direction ? self.list.length - 1 : 0;
},
haveNext: function () {
if ((self.direction && self.current > 0) ||
(!self.direction && self.current < self.list.length))
return true;
return false;
},
next: function () {
if (self.direction && self.current > 0)
return self.list[self.current--];
if (!self.direction && self.current < self.list.length)
return self.list[self.current++];
return undefined;
}
}
);
/**
* Revision class. Represents a specific revision. Each instance has three
* possible edges in each direction. Each edge is essentially a Changeset.
@ -360,25 +334,6 @@ $.Class("RevisionCache",
//Something went wrong!
}
},
/**
* Iterate over the list of changesets required to go from one revision to another.
* @param {number} from - The starting revision.
* @param {number} to - The end revision.
* @param {function} callback - The function to apply to each changeset.
*/
iterChangesets: function (from, to, callback) {
// first try to build a path from the cache:
var path = this.findPath(from, to);
if (!path.is_complete) {
// TODO: request load of any other changesets.
// before we start iterating over existing
// in the hope that some of them will be
// fulfilled soon.bt
}
// we have a partial path
console.log(from, to, path.current.revnum);
// TODO: loop over existing changesets and apply
}
}
);
@ -558,7 +513,6 @@ Thread("ChangesetLoader",
}
);
var libchangeset = require("./Changeset");
var AttribPool = require("./AttributePool");
var domline = require("./domline").domline;
var linestylefilter = require("./linestylefilter").linestylefilter;
@ -659,15 +613,14 @@ $.Class("PadClient",
},
}
);
function loadBroadcastRevisionsJS(clientVars, connection)
function init(clientVars, connection)
{
revisionCache = new RevisionCache(connection, clientVars.collab_client_vars.rev || 0);
// revisionInfo.latest = clientVars.collab_client_vars.rev || -1;
revisionCache = new RevisionCache(connection, clientVars.collab_client_vars.rev || 0);
var collabClientVars = clientVars.collab_client_vars;
p = new PadClient(collabClientVars.rev, collabClientVars.time, collabClientVars.initialAttributedText.text, collabClientVars.initialAttributedText.attribs, collabClientVars.apool);
}
exports.loadBroadcastRevisionsJS = loadBroadcastRevisionsJS;
exports.init = init;