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

Fix #293 - Fix a-tag handling on Gecko

Browse source
This commit is contained in:
mmso 2018-03-13 16:44:16 +01:00
parent 465c1268be
commit adeee498cc
No known key found for this signature in database
GPG key ID: 954AFC83B3C56A54
1 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
source/KeyHandlers.js
View file

@ -14,6 +14,29 @@ var keys = {
221: ']' 221: ']'
}; };
/**
* If the cursor is at the end of a link , then move it outside of the link so that the entered text does
* not become part of the link text. Special case for gecko which does not move outside automatically.
*
* @param {Squire} self Instance of the editor.
* @param {Range} range Current selection range.
*/
function handleATagCursor(self, range) {
var node = range.endContainer;
var parent = node.parentNode;
if (isGecko) {
if ( range.collapsed && node.nodeName === 'A' && range.endOffset === getLength( node ) ) {
range.setStartAfter( node );
self.setSelection( range );
}
}
if ( range.collapsed && parent.nodeName === 'A' &&
!node.nextSibling && range.endOffset === getLength( node ) ) {
range.setStartAfter( parent );
self.setSelection( range );
}
}
// Ref: http://unixpapa.com/js/key.html // Ref: http://unixpapa.com/js/key.html
var onKey = function ( event ) { var onKey = function ( event ) {
var code = event.keyCode, var code = event.keyCode,
@ -67,6 +90,8 @@ var onKey = function ( event ) {
this._ensureBottomLine(); this._ensureBottomLine();
this.setSelection( range ); this.setSelection( range );
this._updatePath( range, true ); this._updatePath( range, true );
} else {
handleATagCursor( this, range );
} }
}; };
@ -427,17 +452,10 @@ var keyHandlers = {
addLinks( range.startContainer, self._root, self ); addLinks( range.startContainer, self._root, self );
self._getRangeAndRemoveBookmark( range ); self._getRangeAndRemoveBookmark( range );
// If the cursor is at the end of a link (<a>foo|</a>) then move it handleATagCursor(self, range);
// 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 );
}
// Delete the selection if not collapsed // Delete the selection if not collapsed
else if ( !range.collapsed ) { if ( !range.collapsed ) {
deleteContentsOfRange( range, self._root ); deleteContentsOfRange( range, self._root );
self._ensureBottomLine(); self._ensureBottomLine();
self.setSelection( range ); self.setSelection( range );