Merge branch 't/9239c'

ckeditor · Oct 22, 2012 · a9da7a5afbb6f6a12763fe210decdcb0b7ef9e3b · a9da7a5
2 parents f4a14de + 9022ebd
commit a9da7a5afbb6f6a12763fe210decdcb0b7ef9e3b
Unified Split

Showing with 6 additions and 0 deletions.

+6 −0 core/selection.js
diff --git a/core/selection.js b/core/selection.js
@@ -1297,6 +1297,12 @@
 			this.reset();
 			if ( restore ) {
+  
+				// Saved selection may be outdated (e.g. anchored in offline nodes).
+  
+				// Avoid getting broken by such.
+  
+				var common = selectedElement || ranges[ 0 ].getCommonAncestor();
+  
+				if ( !( common && common.getAscendant( 'body', 1 ) ) )
+  
+					return;
+  
+
 				if ( selectedElement )
 					this.selectElement( selectedElement );
 				else