Ticket #8324: 8324_2.patch

_source/plugins/undo/plugin.js

@@ -407 +407 @@
                                 this.fireChange();
                         return true;
                 },
+
+                restoreImage : function( image )
+                {
+                        // Bring editor focused to restore selection.
+                        var editor = this.editor,
+                                sel;
 
-                restoreImage : function( image )
-                {
-                        this.editor.loadSnapshot( image.contents );
-
                         if ( image.bookmarks )
-                        {
-                                this.editor.focus();
-                                this.editor.getSelection().selectBookmarks( image.bookmarks );
+                        {
+                                editor.focus();
+                                // Retrieve the selection beforehand. (#8324)
+                                sel = editor.getSelection();
                         }
-                        else if ( CKEDITOR.env.ie )
-                        {
-                                // IE BUG: If I don't set the selection to *somewhere* after setting
+
+                        this.editor.loadSnapshot( image.contents );
+
+                        if ( image.bookmarks )
+                                sel.selectBookmarks( image.bookmarks );
+                        else if ( CKEDITOR.env.ie )
+                        {
+                                // IE BUG: If I don't set the selection to *somewhere* after setting
                                 // document contents, then IE would create an empty paragraph at the bottom
                                 // the next time the document is modified.
                                 var $range = this.editor.document.getBody().$.createTextRange();