Ticket #6438: 6438_2.patch

_source/plugins/selection/plugin.js

@@ -155 +155 @@
                                                         {
                                                                 // Enable selections to be saved.
                                                                 saveEnabled = 1;
-
-                                                                saveSelection();
                                                         });
 
                                                 body.on( 'beforedeactivate', function( evt )
@@ -166 +164 @@
                                                                 if ( evt.data.$.toElement )
                                                                         return;
 
+                                                                saveSelection();
+
                                                                 // Disable selections from being saved.
                                                                 saveEnabled = 0;
                                                                 restoreEnabled = 1;
@@ -215 +215 @@
                                                         });
                                                 }
 
-                                                var scroll;
-                                                // IE fires the "selectionchange" event when clicking
-                                                // inside a selection. We don't want to capture that.
-                                                body.on( 'mousedown', function( evt )
-                                                {
-                                                        // IE scrolls document to top on right mousedown
-                                                        // when editor has no focus, remember this scroll
-                                                        // position and revert it before context menu opens. (#5778)
-                                                        if ( evt.data.$.button == 2 )
-                                                        {
-                                                                var sel = editor.document.$.selection;
-                                                                if ( sel.type == 'None' )
-                                                                        scroll = editor.window.getScrollPosition();
-                                                        }
-                                                        disableSave();
-                                                });
-
-                                                body.on( 'mouseup',
-                                                        function( evt )
-                                                        {
-                                                                // Restore recorded scroll position when needed on right mouseup.
-                                                                if ( evt.data.$.button == 2 && scroll )
-                                                                {
-                                                                        editor.document.$.documentElement.scrollLeft = scroll.x;
-                                                                        editor.document.$.documentElement.scrollTop = scroll.y;
-                                                                }
-                                                                scroll = null;
-
-                                                                saveEnabled = 1;
-                                                                setTimeout( function()
-                                                                        {
-                                                                                saveSelection( true );
-                                                                        },
-                                                                        0 );
-                                                        });
-
-                                                body.on( 'keydown', disableSave );
-                                                body.on( 'keyup',
-                                                        function()
-                                                        {
-                                                                saveEnabled = 1;
-                                                                saveSelection();
-                                                        });
-
-
-                                                // IE is the only to provide the "selectionchange"
-                                                // event.
-                                                doc.on( 'selectionchange', saveSelection );
-
                                                 function disableSave()
                                                 {
                                                         saveEnabled = 0;
@@ -311 +262 @@
 
                                                                 savedRange = nativeSel && sel.getRanges()[ 0 ];
 
-                                                                checkSelectionChangeTimeout.call( editor );
                                                         }
                                                 }
+
+                                                // IE is the only to provide the "selectionchange" event.
+                                                doc.on( 'selectionchange', checkSelectionChangeTimeout, editor );
                                         }
                                         else
                                         {