File tree Expand file tree Collapse file tree 1 file changed +4
-12
lines changed
vendor/assets/javascripts/bootstrap-wysihtml5 Expand file tree Collapse file tree 1 file changed +4
-12
lines changed Original file line number Diff line number Diff line change @@ -5867,12 +5867,11 @@ wysihtml5.quirks.cleanPastedHTML = (function() {
5867
5867
5868
5868
if ( keyCode === wysihtml5 . ENTER_KEY && ! wysihtml5 . browser . insertsLineBreaksOnReturn ( ) ) {
5869
5869
composer . commands . exec ( "insertLineBreak" ) ;
5870
- event . preventDefault ( ) ;
5871
5870
}
5871
+
5872
+ // keypress doesn't fire when you hit backspace
5873
+ dom . observe ( composer . element . ownerDocument , "keydown" , keyDown ) ;
5872
5874
}
5873
-
5874
- // keypress doesn't fire when you hit backspace
5875
- dom . observe ( composer . element . ownerDocument , "keydown" , keyDown ) ;
5876
5875
} ;
5877
5876
} ) ( wysihtml5 ) ; /**
5878
5877
* Force rerendering of a given element
@@ -7472,14 +7471,7 @@ wysihtml5.Commands = Base.extend(
7472
7471
7473
7472
wysihtml5 . commands . insertLineBreak = {
7474
7473
exec : function ( composer , command ) {
7475
- if ( composer . commands . support ( command ) ) {
7476
- composer . doc . execCommand ( command , false , null ) ;
7477
- if ( ! wysihtml5 . browser . autoScrollsToCaret ( ) ) {
7478
- composer . selection . scrollIntoView ( ) ;
7479
- }
7480
- } else {
7481
- composer . commands . exec ( "insertHTML" , LINE_BREAK ) ;
7482
- }
7474
+ composer . commands . exec ( "insertHTML" , LINE_BREAK ) ;
7483
7475
} ,
7484
7476
7485
7477
state : function ( ) {
You can’t perform that action at this time.
0 commit comments