Korbs/Squire
0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2025-01-03 05:00:13 -05:00
Code Issues Activity

Escape <a> on space even if in nested tags

Browse source 
Fixes #326
This commit is contained in:
Neil Jenkins 2018-10-05 16:25:28 +10:00
parent 9b654a82b1
commit b14ae45b38
3 changed files with 34 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
build/squire-raw.js
View file

@ -829,7 +829,7 @@ var extractContentsOfRange = function ( range, common, root ) {
var endNode = split( endContainer, endOffset, common, root ), var endNode = split( endContainer, endOffset, common, root ),
startNode = split( startContainer, startOffset, common, root ), startNode = split( startContainer, startOffset, common, root ),
frag = common.ownerDocument.createDocumentFragment(), frag = common.ownerDocument.createDocumentFragment(),
next, before, after; next, before, after, beforeText, afterText;
// End node will be null if at end of child nodes list. // End node will be null if at end of child nodes list.
while ( startNode !== endNode ) { while ( startNode !== endNode ) {
@ -852,7 +852,17 @@ var extractContentsOfRange = function ( range, common, root ) {
after.nodeType === TEXT_NODE ) { after.nodeType === TEXT_NODE ) {
startContainer = before; startContainer = before;
startOffset = before.length; startOffset = before.length;
before.appendData( after.data ); beforeText = before.data;
afterText = after.data;
// If we now have two adjacent spaces, the second one needs to become
// a nbsp, otherwise the browser will swallow it due to HTML whitespace
// collapsing.
if ( beforeText.charAt( beforeText.length - 1 ) === ' ' &&
afterText.charAt( 0 ) === ' ' ) {
afterText = ' ' + afterText.slice( 1 ); // nbsp
}
before.appendData( afterText );
detach( after ); detach( after );
} }
@ -1748,25 +1758,27 @@ var keyHandlers = {
}, },
space: function ( self, _, range ) { space: function ( self, _, range ) {
var node, parent; var node, parent;
var root = self._root;
self._recordUndoState( range ); self._recordUndoState( range );
addLinks( range.startContainer, self._root, self ); addLinks( range.startContainer, root, self );
self._getRangeAndRemoveBookmark( range ); self._getRangeAndRemoveBookmark( range );
// If the cursor is at the end of a link (<a>foo|</a>) then move it // If the cursor is at the end of a link (<a>foo|</a>) then move it
// outside of the link (<a>foo</a>|) so that the space is not part of // outside of the link (<a>foo</a>|) so that the space is not part of
// the link text. // the link text.
node = range.endContainer; node = range.endContainer;
parent = node.parentNode;
if ( range.collapsed && range.endOffset === getLength( node ) ) { if ( range.collapsed && range.endOffset === getLength( node ) ) {
if ( node.nodeName === 'A' ) { do {
range.setStartAfter( node ); if ( node.nodeName === 'A' ) {
} else if ( parent.nodeName === 'A' && !node.nextSibling ) { range.setStartAfter( node );
range.setStartAfter( parent ); break;
} }
} while ( !node.nextSibling &&
( node = node.parentNode ) && node !== root );
} }
// Delete the selection if not collapsed // Delete the selection if not collapsed
if ( !range.collapsed ) { if ( !range.collapsed ) {
deleteContentsOfRange( range, self._root ); deleteContentsOfRange( range, root );
self._ensureBottomLine(); self._ensureBottomLine();
self.setSelection( range ); self.setSelection( range );
self._updatePath( range, true ); self._updatePath( range, true );

4
build/squire.js
View file

File diff suppressed because one or more lines are too long

18
source/KeyHandlers.js
View file

@ -477,25 +477,27 @@ var keyHandlers = {
}, },
space: function ( self, _, range ) { space: function ( self, _, range ) {
var node, parent; var node, parent;
var root = self._root;
self._recordUndoState( range ); self._recordUndoState( range );
addLinks( range.startContainer, self._root, self ); addLinks( range.startContainer, root, self );
self._getRangeAndRemoveBookmark( range ); self._getRangeAndRemoveBookmark( range );
// If the cursor is at the end of a link (<a>foo|</a>) then move it // If the cursor is at the end of a link (<a>foo|</a>) then move it
// outside of the link (<a>foo</a>|) so that the space is not part of // outside of the link (<a>foo</a>|) so that the space is not part of
// the link text. // the link text.
node = range.endContainer; node = range.endContainer;
parent = node.parentNode;
if ( range.collapsed && range.endOffset === getLength( node ) ) { if ( range.collapsed && range.endOffset === getLength( node ) ) {
if ( node.nodeName === 'A' ) { do {
range.setStartAfter( node ); if ( node.nodeName === 'A' ) {
} else if ( parent.nodeName === 'A' && !node.nextSibling ) { range.setStartAfter( node );
range.setStartAfter( parent ); break;
} }
} while ( !node.nextSibling &&
( node = node.parentNode ) && node !== root );
} }
// Delete the selection if not collapsed // Delete the selection if not collapsed
if ( !range.collapsed ) { if ( !range.collapsed ) {
deleteContentsOfRange( range, self._root ); deleteContentsOfRange( range, root );
self._ensureBottomLine(); self._ensureBottomLine();
self.setSelection( range ); self.setSelection( range );
self._updatePath( range, true ); self._updatePath( range, true );