Ticket #3849: 3849.patch

_source/plugins/selection/plugin.js

@@ -943 +943 @@
                 function()
                 {
                         var collapsed = this.collapsed;
-                        var isStartMakerAlone;
+                        var isStartMarkerAlone;
                         var dummySpan;
 
                         var bookmark = this.createBookmark();
@@ -976 +976 @@
                         }
                         else
                         {
-// The isStartMakerAlone logic comes from V2. It guarantees that the lines
-// will expand and that the cursor will be blinking on the right place.
-// Actually, we are using this flag just to avoid using this hack in all
-// situations, but just on those needed.
+                                // The isStartMarkerAlone logic comes from V2. It guarantees that the lines
+                                // will expand and that the cursor will be blinking on the right place.
+                                // Actually, we are using this flag just to avoid using this hack in all
+                                // situations, but just on those needed.
+                                isStartMarkerAlone = !startNode.hasPrevious() || ( startNode.getPrevious().is && startNode.getPrevious().is( 'br' ) );
 
-// But, in V3, somehow it is not interested on working whe hitting SHIFT+ENTER
-// inside text. So, let's jsut leave the hack happen always.
-
-// I'm still leaving the code here just in case. We may find some other IE
-// weirdness and uncommenting this stuff may be useful.
-
-//                              isStartMakerAlone = ( !startNode.hasPrevious() || ( startNode.getPrevious().is && startNode.getPrevious().is( 'br' ) ) )
-//                                      && !startNode.hasNext();
-
                                 // Append a temporary <span>&#65279;</span> before the selection.
                                 // This is needed to avoid IE destroying selections inside empty
                                 // inline elements, like <b></b> (#253).
@@ -999 +991 @@
                                 dummySpan.setHtml( '&#65279;' );        // Zero Width No-Break Space (U+FEFF). See #1359.
                                 dummySpan.insertBefore( startNode );
 
-//                              if ( isStartMakerAlone )
-//                              {
+                                if ( isStartMarkerAlone )
+                                {
                                         // To expand empty blocks or line spaces after <br>, we need
                                         // instead to have any char, which will be later deleted using the
                                         // selection.
                                         // \ufeff = Zero Width No-Break Space (U+FEFF). (#1359)
                                         this.document.createText( '\ufeff' ).insertBefore( startNode );
-//                              }
+                                }
                         }
 
                         // Remove the markers (reset the position, because of the changes in the DOM tree).
@@ -1015 +1007 @@
 
                         if ( collapsed )
                         {
-//                              if ( isStartMakerAlone )
-//                              {
+                                if ( isStartMarkerAlone )
+                                {
                                         // Move the selection start to include the temporary \ufeff.
                                         ieRange.moveStart( 'character', -1 );
 
@@ -1024 +1016 @@
 
                                         // Remove our temporary stuff.
                                         this.document.$.selection.clear();
-//                              }
-//                              else
-//                                      ieRange.select();
+                                }
+                                else
+                                        ieRange.select();
 
                                 dummySpan.remove();
                         }