Skip to content
This repository has been archived by the owner on May 12, 2020. It is now read-only.

Commit

Permalink
Merge pull request #202 from adityab/selection-refresh
Browse files Browse the repository at this point in the history 
Make Selections properly update on direct styling.
  • Loading branch information
Friedrich committed Nov 20, 2013
2 parents bf27667 + 210c817 commit 48f62e2
Show file tree
Hide file tree
Showing 2 changed files with 193 additions and 6 deletions.
16 changes: 10 additions & 6 deletions webodf/lib/core/DomUtils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -299,11 +299,13 @@
var range = node.ownerDocument.createRange(),
nodeRange = node.ownerDocument.createRange(),
result;

range.setStart(limits.startContainer, limits.startOffset);
range.setEnd(limits.endContainer, limits.endOffset);
nodeRange.selectNodeContents(node);
result = range.compareBoundaryPoints(Range.START_TO_START, nodeRange) <= 0
&& range.compareBoundaryPoints(Range.END_TO_END, nodeRange) >= 0;

result = containsRange(range, nodeRange);

range.detach();
nodeRange.detach();
return result;
Expand Down Expand Up @@ -361,11 +363,13 @@

function rangeIntersectsNode(range, node) {
var nodeRange = node.ownerDocument.createRange(),
intersects;
result;

nodeRange.selectNodeContents(node);
intersects = range.compareBoundaryPoints(Range.START_TO_END, nodeRange) <= 0
&& range.compareBoundaryPoints(Range.END_TO_START, nodeRange) >= 0;
return intersects;
result = rangesIntersect(range, nodeRange);
nodeRange.detach();

return result;
}
this.rangeIntersectsNode = rangeIntersectsNode;

Expand Down
183 changes: 183 additions & 0 deletions webodf/tests/core/DomUtilsTests.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,181 @@ core.DomUtilsTests = function DomUtilsTests(runner) {
r.shouldBe(t, "t.result", "true");
}

function rangeIntersectsRange_IdenticalBoundaries_ReturnsTrue() {
var container = document.createElement("p"),
span1 = document.createElement("span"),
span2 = document.createElement("span"),
start = document.createTextNode("start"),
end = document.createTextNode("end"),
range1 = document.createRange(),
range2 = document.createRange();

span1.appendChild(start);
span2.appendChild(end);
container.appendChild(span1);
container.appendChild(span2);
t.doc.appendChild(container);

range1.setStart(start, 0);
range1.setEnd(end, 0);
range2.setStart(start, 0);
range2.setEnd(end, 0);

t.result = t.utils.rangesIntersect(range1, range2);

r.shouldBe(t, "t.result", "true");
}

function rangeIntersectsRange_Partial_ReturnsTrue() {
var container = document.createElement("p"),
span1 = document.createElement("span"),
span2 = document.createElement("span"),
start = document.createTextNode("start"),
end = document.createTextNode("end"),
range1 = document.createRange(),
range2 = document.createRange();

span1.appendChild(start);
span2.appendChild(end);
container.appendChild(span1);
container.appendChild(span2);
t.doc.appendChild(container);

range1.setStart(start, 0);
range1.setEnd(end, 0);
range2.setStart(start, 2);
range2.setEnd(end, end.length);

t.result = t.utils.rangesIntersect(range1, range2);

r.shouldBe(t, "t.result", "true");
}

function rangeIntersectsRange_Encapsulator_ReturnsTrue() {
var container = document.createElement("p"),
span1 = document.createElement("span"),
span2 = document.createElement("span"),
start = document.createTextNode("start"),
end = document.createTextNode("end"),
range1 = document.createRange(),
range2 = document.createRange();

span1.appendChild(start);
span2.appendChild(end);
container.appendChild(span1);
container.appendChild(span2);
t.doc.appendChild(container);

range1.setStart(start, 0);
range1.setEnd(end, end.length);
range2.setStart(start, 2);
range2.setEnd(end, 1);

t.result = t.utils.rangesIntersect(range1, range2);

r.shouldBe(t, "t.result", "true");
}

function rangeIntersectsRange_Encapsulatee_ReturnsTrue() {
var container = document.createElement("p"),
span1 = document.createElement("span"),
span2 = document.createElement("span"),
start = document.createTextNode("start"),
end = document.createTextNode("end"),
range1 = document.createRange(),
range2 = document.createRange();

span1.appendChild(start);
span2.appendChild(end);
container.appendChild(span1);
container.appendChild(span2);
t.doc.appendChild(container);

range1.setStart(start, 3);
range1.setEnd(end, 0);
range2.setStart(start, 1);
range2.setEnd(end, 2);

t.result = t.utils.rangesIntersect(range1, range2);

r.shouldBe(t, "t.result", "true");
}

function rangeIntersectsRange_Disjoint_ReturnsFalse() {
var container = document.createElement("p"),
span1 = document.createElement("span"),
span2 = document.createElement("span"),
start = document.createTextNode("start"),
end = document.createTextNode("end"),
range1 = document.createRange(),
range2 = document.createRange();

span1.appendChild(start);
span2.appendChild(end);
container.appendChild(span1);
container.appendChild(span2);
t.doc.appendChild(container);

range1.setStart(start, 0);
range1.setEnd(start, start.length);
range2.setStart(end, 0);
range2.setEnd(end, end.length);

t.result = t.utils.rangesIntersect(range1, range2);

r.shouldBe(t, "t.result", "false");
}

function rangeIntersectsRange_LeftTouch_ReturnsTrue() {
var container = document.createElement("p"),
span1 = document.createElement("span"),
span2 = document.createElement("span"),
start = document.createTextNode("start"),
end = document.createTextNode("end"),
range1 = document.createRange(),
range2 = document.createRange();

span1.appendChild(start);
span2.appendChild(end);
container.appendChild(span1);
container.appendChild(span2);
t.doc.appendChild(container);

range1.setStart(start, 0);
range1.setEnd(start, 2);
range2.setStart(start, 2);
range2.setEnd(end, end.length);

t.result = t.utils.rangesIntersect(range1, range2);

r.shouldBe(t, "t.result", "true");
}

function rangeIntersectsRange_RightTouch_ReturnsTrue() {
var container = document.createElement("p"),
span1 = document.createElement("span"),
span2 = document.createElement("span"),
start = document.createTextNode("start"),
end = document.createTextNode("end"),
range1 = document.createRange(),
range2 = document.createRange();

span1.appendChild(start);
span2.appendChild(end);
container.appendChild(span1);
container.appendChild(span2);
t.doc.appendChild(container);

range1.setStart(end, 1);
range1.setEnd(end, end.length);
range2.setStart(start, 0);
range2.setEnd(end, 1);

t.result = t.utils.rangesIntersect(range1, range2);

r.shouldBe(t, "t.result", "true");
}

function removeUnwantedNodes_DiscardAll() {
var p = document.createElement("p"),
span1 = document.createElement("span"),
Expand Down Expand Up @@ -376,6 +551,14 @@ core.DomUtilsTests = function DomUtilsTests(runner) {
rangeContainsNode_ForAdjacentSpan_ReturnsFalse,
rangeContainsNode_IdenticalBoundaries_ReturnsTrue,

rangeIntersectsRange_IdenticalBoundaries_ReturnsTrue,
rangeIntersectsRange_Partial_ReturnsTrue,
rangeIntersectsRange_Encapsulator_ReturnsTrue,
rangeIntersectsRange_Encapsulatee_ReturnsTrue,
rangeIntersectsRange_Disjoint_ReturnsFalse,
rangeIntersectsRange_LeftTouch_ReturnsTrue,
rangeIntersectsRange_RightTouch_ReturnsTrue,

removeUnwantedNodes_DiscardAll,
removeUnwantedNodes_DiscardSpanOnly
];
Expand Down

0 comments on commit 48f62e2

Please sign in to comment.