Return null from getSelection when not in wysiwyg mode.

ckeditor · Sep 11, 2013 · ddf9074 · ddf9074
1 parent f8d97f2
commit ddf9074
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/core/selection.js b/core/selection.js
@@ -39,7 +39,7 @@
 			sel = this.getSelection( 1 );
 
 			// Editor may have no selection at all.
-			if ( sel.getType() == CKEDITOR.SELECTION_NONE )
+			if ( !sel || sel.getType() == CKEDITOR.SELECTION_NONE )
 				return;
 		}
 
@@ -630,9 +630,9 @@
 		if ( ( this._.savedSelection || this._.fakeSelection ) && !forceRealSelection )
 			return this._.savedSelection || this._.fakeSelection;
 
-		// Editable element might be absent.
+		// Editable element might be absent or editor might not be in a wysiwyg mode.
 		var editable = this.editable();
-		return editable ? new CKEDITOR.dom.selection( editable ) : null;
+		return editable && this.mode == 'wysiwyg' ? new CKEDITOR.dom.selection( editable ) : null;
 	};
 
 	/**