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

Ensure space is inserted after link if cursor at end of <a> tag

Browse source 
If your cursor is at the end of a link, ensure pressing space always inserts
the space outside of the <a> tag.
This commit is contained in:
Neil Jenkins 2014-12-24 14:24:25 +07:00
parent 824a3b0a3b
commit f781e07b23
3 changed files with 40 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
build/squire-raw.js
View file

@ -1337,22 +1337,12 @@ proto.getSelection = function () {
selection = sel.getRangeAt( 0 ).cloneRange(); selection = sel.getRangeAt( 0 ).cloneRange();
startContainer = selection.startContainer; startContainer = selection.startContainer;
endContainer = selection.endContainer; endContainer = selection.endContainer;
// FF sometimes throws an error reading the isLeaf property. Let's // FF can return the selection as being inside an <img>. WTF?
// catch and log it to see if we can find what's going on. if ( startContainer && isLeaf( startContainer ) ) {
try { selection.setStartBefore( startContainer );
// FF can return the selection as being inside an <img>. WTF? }
if ( startContainer && isLeaf( startContainer ) ) { if ( endContainer && isLeaf( endContainer ) ) {
selection.setStartBefore( startContainer ); selection.setEndBefore( endContainer );
}
if ( endContainer && isLeaf( endContainer ) ) {
selection.setEndBefore( endContainer );
}
} catch ( error ) {
this.didError({
name: 'Squire#getSelection error',
message: 'Starts: ' + startContainer.nodeName +
'\nEnds: ' + endContainer.nodeName
});
} }
this._lastSelection = selection; this._lastSelection = selection;
} else { } else {
@ -3025,10 +3015,22 @@ var keyHandlers = {
} }
}, },
space: function ( self ) { space: function ( self ) {
var range = self.getSelection(); var range = self.getSelection(),
node, parent;
self._recordUndoState( range ); self._recordUndoState( range );
addLinks( range.startContainer ); addLinks( range.startContainer );
self._getRangeAndRemoveBookmark( range ); self._getRangeAndRemoveBookmark( range );
// 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
// the link text.
node = range.endContainer;
parent = node.parentNode;
if ( range.collapsed && parent.nodeName === 'A' &&
!node.nextSibling && range.endOffset === getLength( node ) ) {
range.setStartAfter( parent );
}
self.setSelection( range ); self.setSelection( range );
}, },
left: function ( self ) { left: function ( self ) {

4
build/squire.js
View file

File diff suppressed because one or more lines are too long

36
source/Editor.js
View file

@ -252,22 +252,12 @@ proto.getSelection = function () {
selection = sel.getRangeAt( 0 ).cloneRange(); selection = sel.getRangeAt( 0 ).cloneRange();
startContainer = selection.startContainer; startContainer = selection.startContainer;
endContainer = selection.endContainer; endContainer = selection.endContainer;
// FF sometimes throws an error reading the isLeaf property. Let's // FF can return the selection as being inside an <img>. WTF?
// catch and log it to see if we can find what's going on. if ( startContainer && isLeaf( startContainer ) ) {
try { selection.setStartBefore( startContainer );
// FF can return the selection as being inside an <img>. WTF? }
if ( startContainer && isLeaf( startContainer ) ) { if ( endContainer && isLeaf( endContainer ) ) {
selection.setStartBefore( startContainer ); selection.setEndBefore( endContainer );
}
if ( endContainer && isLeaf( endContainer ) ) {
selection.setEndBefore( endContainer );
}
} catch ( error ) {
this.didError({
name: 'Squire#getSelection error',
message: 'Starts: ' + startContainer.nodeName +
'\nEnds: ' + endContainer.nodeName
});
} }
this._lastSelection = selection; this._lastSelection = selection;
} else { } else {
@ -1940,10 +1930,22 @@ var keyHandlers = {
} }
}, },
space: function ( self ) { space: function ( self ) {
var range = self.getSelection(); var range = self.getSelection(),
node, parent;
self._recordUndoState( range ); self._recordUndoState( range );
addLinks( range.startContainer ); addLinks( range.startContainer );
self._getRangeAndRemoveBookmark( range ); self._getRangeAndRemoveBookmark( range );
// 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
// the link text.
node = range.endContainer;
parent = node.parentNode;
if ( range.collapsed && parent.nodeName === 'A' &&
!node.nextSibling && range.endOffset === getLength( node ) ) {
range.setStartAfter( parent );
}
self.setSelection( range ); self.setSelection( range );
}, },
left: function ( self ) { left: function ( self ) {