Changeset 6579

Timestamp:

01/09/2008 08:14:29 AM (17 years ago)

Author:

ryan

Message:

New image uploader from tellyworth. see #5609

Location:

trunk

Files:

• wp-admin/css/media.css (added)
• wp-admin/images/align-center.png (added)
• wp-admin/images/align-left.png (added)
• wp-admin/images/align-none.png (added)
• wp-admin/images/align-right.png (added)
• wp-admin/includes/admin.php (modified) (1 diff)
• wp-admin/includes/image.php (modified) (1 diff)
• wp-admin/includes/media.php (added)
• wp-admin/js/media-upload.js (added)
• wp-admin/media-upload.php (added)
• wp-admin/post-new.php (modified) (1 diff)
• wp-admin/post.php (modified) (1 diff)
• wp-includes/js/thickbox (added)
• wp-includes/js/thickbox/loadingAnimation.gif (added)
• wp-includes/js/thickbox/tb-close.png (added)
• wp-includes/js/thickbox/thickbox.css (added)
• wp-includes/js/thickbox/thickbox.js (added)
• wp-includes/script-loader.php (modified) (2 diffs)

trunk/wp-admin/includes/admin.php

@@ -5 +5 @@
 require_once(ABSPATH . 'wp-admin/includes/file.php');
 require_once(ABSPATH . 'wp-admin/includes/image.php');
+require_once(ABSPATH . 'wp-admin/includes/media.php');
 require_once(ABSPATH . 'wp-admin/includes/import.php');
 require_once(ABSPATH . 'wp-admin/includes/misc.php');

trunk/wp-admin/includes/image.php

@@ -318 +318 @@
 }
 
-function media_buttons() { // just a placeholder for now
+
 ?>
-<img src="./images/media-buttons.gif" alt="" />
-<?php
-}
-add_action( 'media_buttons', 'media_buttons' );
-
-?>

trunk/wp-admin/post-new.php

@@ -6 +6 @@
 wp_enqueue_script('autosave');
 wp_enqueue_script('post');
+wp_enqueue_script('thickbox');
+wp_enqueue_script('media-upload');
 
 require_once ('./admin-header.php');

trunk/wp-admin/post.php

@@ -60 +60 @@
 
     wp_enqueue_script('post');
+    wp_enqueue_script('thickbox');
+    wp_enqueue_script('media-upload');
 
     if ( 'draft' == $post->post_status )

trunk/wp-includes/script-loader.php

@@ -85 +85 @@
         $this->add( 'suggest', '/wp-includes/js/jquery/suggest.js', array('dimensions'), '1.1');
         $this->add( 'schedule', '/wp-includes/js/jquery/jquery.schedule.js', array('jquery'), '20');
+        $this->add( 'thickbox', '/wp-includes/js/thickbox/thickbox.js', array('jquery'), '3.1');
 
         if ( is_admin() ) {
@@ -108 +109 @@
             $this->add( 'upload', '/wp-admin/js/upload.js', array('jquery'), '20070518' );
             $this->add( 'post', '/wp-admin/js/post.js', array('suggest'), '20080102' );
+            $this->add( 'media-upload', '/wp-admin/js/media-upload.js', false, '20080109' );
             $this->localize( 'upload', 'uploadL10n', array(
                 'browseTitle' => attribute_escape(__('Browse your files')),