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

DomUtils.elementOrder rename and flip

Browse Source 
=> compareElementIndex and returns -1,0,1 in the
tradition of comparators rather than the opposite
This commit is contained in:
David Greenspan
2012-09-16 05:53:47 -07:00
parent 6df0e5b88f
commit e80066a9ef
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/domutils/domutils.js
View File

@@ -251,8 +251,8 @@ DomUtils = {};
if (DomUtils.elementContains(n, clipStart))
return true;
// reject node if (n,start) are in order or (end,n) are in order
return (DomUtils.elementOrder(n, clipStart) > 0) ||
(DomUtils.elementOrder(clipEnd, n) > 0);
return (DomUtils.compareElementIndex(n, clipStart) < 0) ||
(DomUtils.compareElementIndex(clipEnd, n) < 0);
});
};
@@ -264,23 +264,23 @@ DomUtils = {};
// Returns 0 if the nodes are the same or either one contains the other;
// otherwise, 1 if a comes before b, or else -1 if b comes before a in
// otherwise, -1 if a comes before b, or else 1 if b comes before a in
// document order.
// Requires: `a` and `b` are element nodes in the same document tree.
DomUtils.elementOrder = function(a, b) {
DomUtils.compareElementIndex = function(a, b) {
// See http://ejohn.org/blog/comparing-document-position/
if (a === b)
return 0;
if (a.compareDocumentPosition) {
var n = a.compareDocumentPosition(b);
return ((n & 0x18) ? 0 : ((n & 0x4) ? 1 : -1));
return ((n & 0x18) ? 0 : ((n & 0x4) ? -1 : 1));
} else {
// Only old IE is known to not have compareDocumentPosition (though Safari
// originally lacked it). Thankfully, IE gives us a way of comparing elements
// via the "sourceIndex" property.
if (a.contains(b) || b.contains(a))
return 0;
return (a.sourceIndex < b.sourceIndex ? 1 : -1);
return (a.sourceIndex < b.sourceIndex ? -1 : 1);
}
};

2
packages/spark/patch.js
View File

@@ -44,7 +44,7 @@ Spark._patch = function(tgtParent, srcParent, tgtBefore, tgtAfter, preservations
if (pres) {
var tgt = (pres.type === 'region' ? pres.fromStart : pres.from);
if (! lastTgtMatch ||
DomUtils.elementOrder(lastTgtMatch, tgt) > 0) {
DomUtils.compareElementIndex(lastTgtMatch, tgt) < 0) {
if (pres.type === 'region') {
// preserved region for constant landmark
if (patcher.match(pres.fromStart, pres.newRange.firstNode(),