Merge pull request #141 from gertsonderby/test/hasFormat

Added test suite that checks a number of cases for hasFormat().
fastmail · Oct 13, 2015 · 8d178e1 · 8d178e1
2 parents f3028bf + c40f900
commit 8d178e1
Show file tree

Hide file tree

Showing 4 changed files with 113 additions and 2 deletions.
diff --git a/build/squire-raw.js b/build/squire-raw.js
@@ -2803,6 +2803,20 @@ proto.hasFormat = function ( tag, attributes, range ) {
         return false;
     }
 
+    // Sanitize range to prevent weird IE artifacts
+    if ( !range.collapsed &&
+            range.startContainer.nodeType === TEXT_NODE &&
+            range.startOffset === range.startContainer.length &&
+            range.startContainer.nextSibling ) {
+        range.setStartBefore( range.startContainer.nextSibling );
+    }
+    if ( !range.collapsed &&
+            range.endContainer.nodeType === TEXT_NODE &&
+            range.endOffset === 0 &&
+            range.endContainer.previousSibling ) {
+        range.setEndAfter( range.endContainer.previousSibling );
+    }
+
     // If the common ancestor is inside the tag we require, we definitely
     // have the format.
     var root = range.commonAncestorContainer,

diff --git a/build/squire.js b/build/squire.js
diff --git a/source/Editor.js b/source/Editor.js
@@ -684,6 +684,20 @@ proto.hasFormat = function ( tag, attributes, range ) {
         return false;
     }
 
+    // Sanitize range to prevent weird IE artifacts
+    if ( !range.collapsed &&
+            range.startContainer.nodeType === TEXT_NODE &&
+            range.startOffset === range.startContainer.length &&
+            range.startContainer.nextSibling ) {
+        range.setStartBefore( range.startContainer.nextSibling );
+    }
+    if ( !range.collapsed &&
+            range.endContainer.nodeType === TEXT_NODE &&
+            range.endOffset === 0 &&
+            range.endContainer.previousSibling ) {
+        range.setEndAfter( range.endContainer.previousSibling );
+    }
+
     // If the common ancestor is inside the tag we require, we definitely
     // have the format.
     var root = range.commonAncestorContainer,

diff --git a/test/squire.spec.js b/test/squire.spec.js
@@ -32,6 +32,88 @@ describe('Squire RTE', function () {
         editor.setSelection(range);
     }
 
+    describe('hasFormat', function () {
+        var startHTML;
+        beforeEach( function () {
+            startHTML = '<div>one <b>two three</b> four <i>five</i></div>';
+            editor.setHTML(startHTML);
+        });
+
+        it('returns false when range not touching format', function () {
+            var range = doc.createRange();
+            range.setStart(doc.body.childNodes.item(0), 0);
+            range.setEnd(doc.body.childNodes.item(0), 1);
+            editor.setSelection(range);
+            expect(editor.hasFormat('b'), 'to be false');
+        });
+
+        it('returns false when range inside other format', function () {
+            var range = doc.createRange();
+            range.setStart(doc.querySelector('i').childNodes[0], 1);
+            range.setEnd(doc.querySelector('i').childNodes[0], 2);
+            editor.setSelection(range);
+            expect(editor.hasFormat('b'), 'to be false');
+        });
+
+        it('returns false when range covers anything outside format', function () {
+            var range = doc.createRange();
+            range.setStart(doc.querySelector('b').previousSibling, 2);
+            range.setEnd(doc.querySelector('b').childNodes[0], 8);
+            editor.setSelection(range);
+            expect(editor.hasFormat('b'), 'to be false');
+        });
+
+        it('returns true when range inside format', function () {
+            var range = doc.createRange();
+            range.setStart(doc.querySelector('b').childNodes[0], 2);
+            range.setEnd(doc.querySelector('b').childNodes[0], 8);
+            editor.setSelection(range);
+            expect(editor.hasFormat('b'), 'to be true');
+        });
+
+        it('returns true when range covers start of format', function () {
+            var range = doc.createRange();
+            range.setStartBefore(doc.querySelector('b'));
+            range.setEnd(doc.querySelector('b').childNodes[0], 8);
+            editor.setSelection(range);
+            expect(editor.hasFormat('b'), 'to be true');
+        });
+
+        it('returns true when range covers start of format, even in weird cases', function () {
+            var range = doc.createRange();
+            var prev = doc.querySelector('b').previousSibling;
+            range.setStart(prev, prev.length);
+            range.setEnd(doc.querySelector('b').childNodes[0], 8);
+            editor.setSelection(range);
+            expect(editor.hasFormat('b'), 'to be true');
+        });
+
+        it('returns true when range covers end of format', function () {
+            var range = doc.createRange();
+            range.setStart(doc.querySelector('b').childNodes[0], 2);
+            range.setEndAfter(doc.querySelector('b'));
+            editor.setSelection(range);
+            expect(editor.hasFormat('b'), 'to be true');
+        });
+
+        it('returns true when range covers end of format, even in weird cases', function () {
+            var range = doc.createRange();
+            range.setStart(doc.querySelector('b').childNodes[0], 2);
+            var next = doc.querySelector('b').nextSibling;
+            range.setEnd(next, 0);
+            editor.setSelection(range);
+            expect(editor.hasFormat('b'), 'to be true');
+        });
+
+        it('returns true when range covers all of format', function () {
+            var range = doc.createRange();
+            range.setStartBefore(doc.querySelector('b'));
+            range.setEndAfter(doc.querySelector('b'));
+            editor.setSelection(range);
+            expect(editor.hasFormat('b'), 'to be true');
+        });
+    });
+
     describe('removeAllFormatting', function () {
         // Trivial cases
         it('removes inline styles', function () {