Korbs/Squire
0
Fork 0
mirror of https://github.com/fastmail/Squire.git synced 2025-01-18 04:32:28 -05:00
Code Issues Activity

Make shift-enter always just add <br>

Browse source
This commit is contained in:
Neil Jenkins 2018-07-27 09:23:09 +10:00
parent 2d5114c669
commit e07150192f
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build/squire-raw.js
View file

@ -1440,7 +1440,7 @@ var keyHandlers = {
// If this is a malformed bit of document or in a table; // If this is a malformed bit of document or in a table;
// just play it safe and insert a <br>. // just play it safe and insert a <br>.
if ( !block || /^T[HD]$/.test( block.nodeName ) ) { if ( !block || event.shiftKey || /^T[HD]$/.test( block.nodeName ) ) {
// If inside an <a>, move focus out // If inside an <a>, move focus out
parent = getNearest( range.endContainer, root, 'A' ); parent = getNearest( range.endContainer, root, 'A' );
if ( parent ) { if ( parent ) {
@ -1522,6 +1522,11 @@ var keyHandlers = {
self.setSelection( range ); self.setSelection( range );
self._updatePath( range, true ); self._updatePath( range, true );
}, },
'shift-enter': function ( self, event, range ) {
return self._keyHandlers.enter( self, event, range );
},
backspace: function ( self, event, range ) { backspace: function ( self, event, range ) {
var root = self._root; var root = self._root;
self._removeZWS(); self._removeZWS();

4
build/squire.js
View file

File diff suppressed because one or more lines are too long

7
source/KeyHandlers.js
View file

@ -169,7 +169,7 @@ var keyHandlers = {
// If this is a malformed bit of document or in a table; // If this is a malformed bit of document or in a table;
// just play it safe and insert a <br>. // just play it safe and insert a <br>.
if ( !block || /^T[HD]$/.test( block.nodeName ) ) { if ( !block || event.shiftKey || /^T[HD]$/.test( block.nodeName ) ) {
// If inside an <a>, move focus out // If inside an <a>, move focus out
parent = getNearest( range.endContainer, root, 'A' ); parent = getNearest( range.endContainer, root, 'A' );
if ( parent ) { if ( parent ) {
@ -251,6 +251,11 @@ var keyHandlers = {
self.setSelection( range ); self.setSelection( range );
self._updatePath( range, true ); self._updatePath( range, true );
}, },
'shift-enter': function ( self, event, range ) {
return self._keyHandlers.enter( self, event, range );
},
backspace: function ( self, event, range ) { backspace: function ( self, event, range ) {
var root = self._root; var root = self._root;
self._removeZWS(); self._removeZWS();