Ticket #6615: 6615_4.patch

_source/plugins/tableresize/plugin.js

@@ -161 +161 @@
 
                 var leftSideCells, rightSideCells, leftShiftBoundary, rightShiftBoundary;
 
+                var savedRange;
+                function toggleDesignMode( state )
+                {
+                        document.getBody().$.contentEditable = !!state;
+                }
+
                 function detach()
                 {
                         pillar = null;
@@ -171 +177 @@
                         resizer.removeListener( 'mousedown', onMouseDown );
                         resizer.removeListener( 'mousemove', onMouseMove );
 
+                        needsIEHacks && toggleDesignMode( 1 );
                         document.getBody().setStyle( 'cursor', 'auto' );
 
                         // Hide the resizer (remove it on IE7 - #5890).
@@ -278 +285 @@
                 {
                         cancel( evt );
 
+                        if ( needsIEHacks )
+                        {
+                                toggleDesignMode( 1 );
+                                savedRange = document.$.selection.createRange();
+                                if ( savedRange.parentElement().ownerDocument != editor.document.$ )
+                                        savedRange = null;
+                        }
+
                         resizeStart();
 
                         document.on( 'mouseup', onMouseUp, this );
@@ -288 +303 @@
                         evt.removeListener();
 
                         resizeEnd();
+
+                        if ( needsIEHacks && savedRange )
+                                setTimeout( function() { savedRange.select(); }, 0 );
+
                 }
 
                 function onMouseMove( evt )
@@ -331 +350 @@
                                 });
 
                         // In IE6/7, it's not possible to have custom cursors for floating
-                        // elements in an editable document. Show the resizer in that case,
-                        // to give the user a visual clue.
-                        needsIEHacks && resizer.setOpacity( 0.25 );
+                        // elements in an editable document.
+                        needsIEHacks && toggleDesignMode();
 
                         resizer.on( 'mousedown', onMouseDown, this );
 
@@ -392 +410 @@
                         if ( !dest || dest.equals( target ) )
                                 return;
                 }
+                else if ( evt.name == 'keydown' )
+                        target = target.getDocument().getSelection().getStartElement();
 
-                target.getAscendant( 'table', 1 ).removeCustomData( '_cke_table_pillars' );
-                evt.removeListener();
+                var table = target.getAscendant( 'table', 1 );
+                table && table.removeCustomData( '_cke_table_pillars' );
+
+                if ( evt.name != 'keydown' )
+                        evt.removeListener();
         }
 
         CKEDITOR.plugins.add( 'tableresize',
@@ -434 +457 @@
                                                         table.setCustomData( '_cke_table_pillars', ( pillars = buildTableColumnPillars( table ) ) );
                                                         table.on( 'mouseout', clearPillarsCache );
                                                         table.on( 'mousedown', clearPillarsCache );
+                                                        editor.document.removeListener( 'keydown', clearPillarsCache );
+                                                        editor.document.on( 'keydown', clearPillarsCache );
                                                 }
 
                                                 var pillar = getPillarAtPosition( pillars, evt.$.clientX );
-                                                if ( pillar )
+
+                                                // Skip mouse drag/drop/selection.
+                                                if ( pillar && !evt.$.button )
                                                 {
                                                         !resizer && ( resizer = new columnResizer( editor ) );
                                                         resizer.attachTo( pillar );