Changeset 4510

Timestamp:

11/21/2006 08:10:01 PM (18 years ago)

Author:

ryan

Message:

Upload JS fixes from mdawaffe. fixes #3378

Location:

trunk

Files:

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

trunk/wp-admin/upload-js.php

@@ -234 +234 @@
                 win = top;
             tinyMCE = win.tinyMCE;
-            if ( typeof tinyMCE != 'undefined' && tinyMCE.getInstanceById('content') )
-                win.tinyMCE.execCommand('mceInsertContent', false, h);
-            else
+            if ( typeof tinyMCE != 'undefined' && tinyMCE.getInstanceById('content') ) {
+                tinyMCE.selectedInstance.getWin().focus();
+                tinyMCE.execCommand('mceInsertContent', false, h);
+            } else
                 win.edInsertContent(win.edCanvas, h);
             if ( !this.ID )
@@ -244 +245 @@
 
         deleteFile: function(id) {
-            if ( confirm("<?php printf(addslashes(__("Are you sure you want to delete the file %s?\nClick ok to delete or cancel to go back.")), '" + this.currentImage.title + "'); ?>") {
+            if ( confirm("<?php printf(js_escape(__("Are you sure you want to delete the file '%s'?\nClick ok to delete or cancel to go back.")), '" + this.currentImage.title + "'); ?>") ) {
                 $('action-value').value = 'delete';
                 $('upload-file').submit();

trunk/wp-includes/script-loader.php

@@ -31 +31 @@
             $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '3684' );
             $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' );
-            $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '4466' );
+            $this->add( 'upload', '/wp-admin/upload-js.php', array('prototype'), '####' );
         }
     }