Ticket #6438: 6438_3.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;
@@ -229 +229 @@
                                                                 if ( sel.type == 'None' )
                                                                         scroll = editor.window.getScrollPosition();
                                                         }
-                                                        disableSave();
                                                 });
 
                                                 body.on( 'mouseup',
@@ -242 +241 @@
                                                                         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 );
@@ -311 +294 @@
 
                                                                 savedRange = nativeSel && sel.getRanges()[ 0 ];
 
-                                                                checkSelectionChangeTimeout.call( editor );
                                                         }
                                                 }
+
+                                                // IE is the only to provide the "selectionchange" event.
+                                                doc.on( 'selectionchange', checkSelectionChangeTimeout, editor );
                                         }
                                         else
                                         {