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

Remove zws in key handlers they could affect.

Browse source
This commit is contained in:
Neil Jenkins 2014-09-03 09:21:16 +07:00
parent d5e8ef1381
commit 4a8152d280
3 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/squire-raw.js
View file

@ -2824,8 +2824,11 @@ var keyHandlers = {
if ( !range ) { return; } if ( !range ) { return; }
// Save undo checkpoint and add any links in the preceding section. // Save undo checkpoint and add any links in the preceding section.
// Remove any zws so we don't think there's content in an empty
// block.
self._recordUndoState( range ); self._recordUndoState( range );
addLinks( range.startContainer ); addLinks( range.startContainer );
self._removeZWS();
self._getRangeAndRemoveBookmark( range ); self._getRangeAndRemoveBookmark( range );
// Selected text is overwritten, therefore delete the contents // Selected text is overwritten, therefore delete the contents
@ -2958,6 +2961,7 @@ var keyHandlers = {
self._docWasChanged(); self._docWasChanged();
}, },
backspace: function ( self, event ) { backspace: function ( self, event ) {
self._removeZWS();
var range = self.getSelection(); var range = self.getSelection();
// If not collapsed, delete contents // If not collapsed, delete contents
if ( !range.collapsed ) { if ( !range.collapsed ) {
@ -3025,6 +3029,7 @@ var keyHandlers = {
} }
}, },
'delete': function ( self, event ) { 'delete': function ( self, event ) {
self._removeZWS();
var range = self.getSelection(); var range = self.getSelection();
// If not collapsed, delete contents // If not collapsed, delete contents
if ( !range.collapsed ) { if ( !range.collapsed ) {
@ -3079,6 +3084,7 @@ var keyHandlers = {
} }
}, },
tab: function ( self, event ) { tab: function ( self, event ) {
self._removeZWS();
var range = self.getSelection(), var range = self.getSelection(),
node, parent; node, parent;
// If no selection and in an empty block // If no selection and in an empty block

4
build/squire.js
View file

File diff suppressed because one or more lines are too long

6
source/Editor.js
View file

@ -1705,8 +1705,11 @@ var keyHandlers = {
if ( !range ) { return; } if ( !range ) { return; }
// Save undo checkpoint and add any links in the preceding section. // Save undo checkpoint and add any links in the preceding section.
// Remove any zws so we don't think there's content in an empty
// block.
self._recordUndoState( range ); self._recordUndoState( range );
addLinks( range.startContainer ); addLinks( range.startContainer );
self._removeZWS();
self._getRangeAndRemoveBookmark( range ); self._getRangeAndRemoveBookmark( range );
// Selected text is overwritten, therefore delete the contents // Selected text is overwritten, therefore delete the contents
@ -1839,6 +1842,7 @@ var keyHandlers = {
self._docWasChanged(); self._docWasChanged();
}, },
backspace: function ( self, event ) { backspace: function ( self, event ) {
self._removeZWS();
var range = self.getSelection(); var range = self.getSelection();
// If not collapsed, delete contents // If not collapsed, delete contents
if ( !range.collapsed ) { if ( !range.collapsed ) {
@ -1906,6 +1910,7 @@ var keyHandlers = {
} }
}, },
'delete': function ( self, event ) { 'delete': function ( self, event ) {
self._removeZWS();
var range = self.getSelection(); var range = self.getSelection();
// If not collapsed, delete contents // If not collapsed, delete contents
if ( !range.collapsed ) { if ( !range.collapsed ) {
@ -1960,6 +1965,7 @@ var keyHandlers = {
} }
}, },
tab: function ( self, event ) { tab: function ( self, event ) {
self._removeZWS();
var range = self.getSelection(), var range = self.getSelection(),
node, parent; node, parent;
// If no selection and in an empty block // If no selection and in an empty block