Changeset 7414

Timestamp:

03/23/12 17:37:00 (14 months ago)

Author:

garry.yao

Message:

Post-fixing #8324 following [7398].

File:

• CKEditor/trunk/_source/plugins/undo/plugin.js (modified) (1 diff)

CKEditor/trunk/_source/plugins/undo/plugin.js

@@ -411 +411 @@
                 restoreImage : function( image )
                 {
+                        // Bring editor focused to restore selection.
+                        var editor = this.editor,
+                                sel;
+
+                        if ( image.bookmarks )
+                        {
+                                editor.focus();
+                                // Retrieve the selection beforehand. (#8324)
+                                sel = editor.getSelection();
+                        }
+
                         this.editor.loadSnapshot( image.contents );
 
                         if ( image.bookmarks )
-                        {
-                                this.editor.focus();
-                                this.editor.getSelection().selectBookmarks( image.bookmarks );
-                        }
+                                sel.selectBookmarks( image.bookmarks );
                         else if ( CKEDITOR.env.ie )
                         {