Changeset 8189

Timestamp:

06/24/2008 09:59:06 PM (18 years ago)

Author:

ryan

Message:

Insert image fixes from azaozz. fixes #7177

Location:

trunk

Files:

• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/js/media-upload.js (modified) (2 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/includes/media.php

@@ -66 +66 @@
         ?>
 <script type="text/javascript">
-<!--
-top.send_to_editor('<?php echo addslashes($html); ?>');
-top.tb_remove();
--->
+/* <![CDATA[ */
+var win = window.dialogArguments || opener || parent || top;
+win.send_to_editor('<?php echo addslashes($html); ?>');
+/* ]]> */
 </script>
         <?php

trunk/wp-admin/js/media-upload.js

@@ -1 +1 @@
 // send html to the post editor
 function send_to_editor(h) {
-        var win = window.dialogArguments || opener || parent || top;
+        if ( typeof tinyMCE != 'undefined' && ( ed = tinyMCE.activeEditor ) && !ed.isHidden() ) {
+                ed.focus();
+                if (tinymce.isIE)
+                        ed.selection.moveToBookmark(tinymce.EditorManager.activeEditor.windowManager.bookmark);
 
-        tinyMCE = win.tinyMCE;
-        if ( typeof tinyMCE != 'undefined' && ( ed = tinyMCE.getInstanceById('content') ) && !ed.isHidden() ) {
-                tinyMCE.selectedInstance.getWin().focus();
-                tinyMCE.execCommand('mceInsertContent', false, h);
+                ed.execCommand('mceInsertContent', false, h);
         } else
-                win.edInsertContent(win.edCanvas, h);
+                edInsertContent(edCanvas, h);
+
+        tb_remove();
 }
 
@@ -36 +38 @@
                 });
         };
+        
+        jQuery('a.thickbox').click(function(){
+                if ( typeof tinyMCE != 'undefined' &&  tinyMCE.activeEditor ) {
+                        tinyMCE.get('content').focus();
+                        tinyMCE.activeEditor.windowManager.bookmark = tinyMCE.activeEditor.selection.getBookmark('simple');
+                }
+        });
 
         $(window).resize( function() { tb_position() } );

trunk/wp-includes/script-loader.php

@@ -160 +160 @@
                 ) );
                 $scripts->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'jquery-ui-sortable' ), '20080520' );
-                $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080523' );
+                $scripts->add( 'media-upload', '/wp-admin/js/media-upload.js', array( 'thickbox' ), '20080624' );
                 $scripts->localize( 'upload', 'uploadL10n', array(
                         'browseTitle' => attribute_escape(__('Browse your files')),