0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2024-12-22 15:23:29 -05:00

Bias towards adding, not removing format.

editor.hasFormat(...) now only returns true if all text in the range has that
format.
This commit is contained in:
Neil Jenkins 2011-11-03 12:44:54 +11:00
parent 0f750d2a0e
commit 183091e4e1

View file

@ -358,30 +358,34 @@ document.addEventListener( 'DOMContentLoaded', function () {
return false; return false;
} }
// 2. Check for ancestor matching tag/attributes // If the common ancestor is inside the tag we require, we definitely
var root = range.commonAncestorContainer; // have the format.
var root = range.commonAncestorContainer,
walker, node;
if ( root.nearest( tag, attributes ) ) { if ( root.nearest( tag, attributes ) ) {
return true; return true;
} }
// 3. Get the elements matching the selector that are inside the root // If common ancestor is a text node and doesn't have the format, we
// of the range and see if any of them are at least partially // definitely don't have it.
// contained within the range if ( root.nodeType === TEXT_NODE ) {
if ( root.nodeType === ELEMENT_NODE ) {
var els = root.getElementsByTagName( tag ),
l = els.length,
el;
while ( l-- ) {
el = els[l];
if ( range.containsNode( el, true ) &&
el.is( tag, attributes ) ) {
return true;
}
}
}
return false; return false;
}
// Otherwise, check each text node at least partially contained within
// the selection and make sure all of them have the format we want.
walker = doc.createTreeWalker( root, SHOW_TEXT, function ( node ) {
return range.containsNode( node, true ) ?
FILTER_ACCEPT : FILTER_SKIP;
}, false );
while ( node = walker.nextNode() ) {
if ( !node.nearest( tag, attributes ) ) {
return false;
}
}
return true;
}; };
var addFormat = function ( tag, attributes, range ) { var addFormat = function ( tag, attributes, range ) {