github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

fold preservation root finding into renderToRange

Browse Source 
all tests pass
This commit is contained in:
Geoff Schmidt
2012-08-04 10:14:15 -07:00
parent c298d031a0
commit 58a9c65ac2
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/spark/spark.js
View File

@@ -290,19 +290,6 @@ _.extend(PreservationController.prototype, {
self.roots.push({ context: context, preserve: preserve,
fromRange: fromRange, toRange: toRange});
},
addAllRoots: function (existingRange, newRange) {
var self = this;
// Consider landmarks that got rerendered and were matched
visitMatchingLandmarks(existingRange, newRange, function (from, to) {
self.addRoot(from.containerNode(), to.preserve, from, to);
});
// Consider landmarks enclosing the updated region
var walk = existingRange;
while ((walk = findParentOfType(Spark._ANNOTATION_LANDMARK, walk)))
self.addRoot(walk.containerNode(), walk.preserve,
existingRange, newRange);
},
addConstantRegions: function (existingRange, newRange) {
var self = this;
visitMatchingLandmarks(existingRange, newRange, function (from, to) {
@@ -384,6 +371,8 @@ _.extend(PreservationController.prototype, {
// landmarks in `frag`, move the landmarks over and perform any node
// or region preservations that they request.
Spark.renderToRange = function (range, htmlFunc) {
var pc = new PreservationController;
// Find all of the landmarks in the old contents of the range
var landmarkTree = {};
visitLandmarkTree(landmarkTree, range, function (landmark, node) {
@@ -399,19 +388,26 @@ Spark.renderToRange = function (range, htmlFunc) {
var tempRange = new LiveRange(Spark._TAG, frag);
// move state of matching landmarks
// match landmarks, moving state and creating preservation roots
visitLandmarkTree(landmarkTree, tempRange, function (landmark, node) {
if (node.original) {
landmark.created = node.original.created;
landmark.state = node.original.state;
node.original.created = false;
pc.addRoot(node.original.containerNode(), landmark.preserve,
node.original, landmark);
node.original = null;
}
});
// find preservation roots that come from landmarks enclosing the
// updated region
var walk = range;
while ((walk = findParentOfType(Spark._ANNOTATION_LANDMARK, walk)))
pc.addRoot(walk.containerNode(), walk.preserve,
range, tempRange);
// compute preservations
var pc = new PreservationController;
pc.addAllRoots(range, tempRange);
pc.addConstantRegions(range, tempRange);
var preservations = pc.computePreservations(range, tempRange);