Merge branch 't/10098'

ckeditor · Feb 21, 2013 · c335a3f · c335a3f
2 parents d360d7b + 5ab7b71
commit c335a3f
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/core/selection.js b/core/selection.js
@@ -201,15 +201,17 @@
 			// Give the editable an initial selection on first focus,
 			// put selection at a consistent position at the start
 			// of the contents. (#5156)
-			editable.attachListener( editable, 'focus', function( evt ) {
-				evt.removeListener();
-
-				if ( restoreSel !== 0 ) {
-					var rng = editor.createRange();
-					rng.moveToElementEditStart( editable );
-					rng.select();
-				}
-			}, null, null, -2 );
+			if ( !CKEDITOR.env.opera ) {
+				editable.attachListener( editable, 'focus', function( evt ) {
+					evt.removeListener();
+
+					if ( restoreSel !== 0 ) {
+						var rng = editor.createRange();
+						rng.moveToElementEditStart( editable );
+						rng.select();
+					}
+				}, null, null, -2 );
+			}
 
 			// Plays the magic here to restore/save dom selection on editable focus/blur.
 			editable.attachListener( editable, 'focus', function() {