X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/b137f4ce021b4022c56f452c2eafa7abfcef0a7c..38ca813a0e312e2768e5b9519f0415cd0aa84781:/wp-admin/js/media-upload.dev.js

diff --git a/wp-admin/js/media-upload.dev.js b/wp-admin/js/media-upload.dev.js
index 7d2565c7..b19f2922 100644
--- a/wp-admin/js/media-upload.dev.js
+++ b/wp-admin/js/media-upload.dev.js
@@ -3,9 +3,9 @@ function send_to_editor(h) {
 	var ed;
 
 	if ( typeof tinyMCE != 'undefined' && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
-		ed.focus();
-		if ( tinymce.isIE )
-			ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark);
+		// restore caret position on IE
+		if ( tinymce.isIE && ed.windowManager.insertimagebookmark )
+			ed.selection.moveToBookmark(ed.windowManager.insertimagebookmark);
 
 		if ( h.indexOf('[caption') === 0 ) {
 			if ( ed.plugins.wpeditimage )
@@ -57,13 +57,16 @@ var tb_position;
 
 	$(window).resize(function(){ tb_position(); });
 
-})(jQuery);
+	// store caret position in IE
+	$(document).ready(function($){
+		$('a.thickbox').click(function(){
+			var ed;
 
-jQuery(document).ready(function($){
-	$('a.thickbox').click(function(){
-		if ( typeof tinyMCE != 'undefined' && tinyMCE.activeEditor ) {
-			tinyMCE.get('content').focus();
-			tinyMCE.activeEditor.windowManager.bookmark = tinyMCE.activeEditor.selection.getBookmark('simple');
-		}
+			if ( typeof tinyMCE != 'undefined' && tinymce.isIE && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
+				ed.focus();
+				ed.windowManager.insertimagebookmark = ed.selection.getBookmark();
+			}
+		});
 	});
-});
+
+})(jQuery);