Merge branch 't/9658'

Reinmar · Reinmar · commit 1e093a05c4e8 · 2012-12-10T18:49:00.000+01:00
diff --git a/plugins/image/plugin.js b/plugins/image/plugin.js
@@ -105,7 +105,7 @@
 	function getSelectedImage( editor, element ) {
 		if ( !element ) {
 			var sel = editor.getSelection();
-			element = ( sel.getType() == CKEDITOR.SELECTION_ELEMENT ) && sel.getSelectedElement();
+			element = sel.getSelectedElement();
 		}
 
 		if ( element && element.is( 'img' ) && !element.data( 'cke-realelement' ) && !element.isReadOnly() )

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@`
`105`	`105`	`function getSelectedImage( editor, element ) {`
`106`	`106`	`if ( !element ) {`
`107`	`107`	`var sel = editor.getSelection();`
`108`		`- element = ( sel.getType() == CKEDITOR.SELECTION_ELEMENT ) && sel.getSelectedElement();`
	`108`	`+ element = sel.getSelectedElement();`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`if ( element && element.is( 'img' ) && !element.data( 'cke-realelement' ) && !element.isReadOnly() )`