Ticket #6988: 6988.002.diff

trunk/wp-admin/includes/media.php

@@ -213 +213 @@
                         $post['post_title'] = $attachment['post_title'];
                 if ( isset($attachment['post_excerpt']) )
                         $post['post_excerpt'] = $attachment['post_excerpt'];
+                if ( isset($attachment['menu_order']) )
+                        $post['menu_order'] = $attachment['menu_order'];
 
                 $post = apply_filters('attachment_fields_to_save', $post, $attachment);
 
@@ -413 +415 @@
                         $errors = $return;
         }
 
+        wp_enqueue_script('admin-gallery');
         return wp_iframe( 'media_upload_gallery_form', $errors );
 }
 
@@ -549 +552 @@
                                 </script>\n",
                         'helps'      => __('Enter a link URL or click above for presets.'),
                 ),
+        'menu_order'   => array(
+                        'label'      => __('Order'),
+                        'value'      => $edit_post->menu_order
+                ),
         );
 
         foreach ( get_attachment_taxonomies($post) as $taxonomy ) {

trunk/wp-admin/js/gallery.js

@@ +1 @@
+jQuery(function($) {
+        var gallerySortable;
+        var gallerySortableInit = function() {
+                try { // a hack to make sortables work in jQuery 1.2+ and IE7
+                        $('#media-items').SortableDestroy();
+                } catch(e) {}
+                $('#media-items .media-item').
+                gallerySortable = $('#media-items').Sortable( {
+                        accept: 'media-item',
+                        helperclass: 'sorthelper',
+//                      handle: 'img.pinkynail',
+                        onchange: galleryReorder,
+                        onStop: gallerySortableInit
+                } );
+        }
+        
+        var galleryReorder = function(myOrder) {
+                jQuery.each(myOrder[0]['o']['media-items'], function(i, id) {
+                        jQuery('#' + id + ' .menu_order input')[0].value = i;
+                })
+        }
+
+        // initialize sortable
+        gallerySortableInit();
+        $('#media-items .media-item').css({
+                position: 'static',
+                cursor: 'move'
+        });
+});

trunk/wp-includes/script-loader.php

@@ -165 +165 @@
                                         'cancel' => __('Cancel'),
                                         'edit' => __('Edit'),
                                 ) );
+                        $this->add( 'admin-gallery', '/wp-admin/js/gallery.js', array( 'interface' ), '20080517' );
                         $this->add( 'media-upload', '/wp-admin/js/media-upload.js', false, '20080430' );
                         $this->localize( 'upload', 'uploadL10n', array(
                                 'browseTitle' => attribute_escape(__('Browse your files')),
@@ -199 +200 @@
                         $this->localize( 'word-count', 'wordCountL10n', array(
                                 'count' => __('Word count: %d')
                         ));
-                        
+
                         $this->add( 'wp-gears', '/wp-admin/js/wp-gears.js', false, '20080511' );
                         $this->localize( 'wp-gears', 'wpGearsL10n', array(
                                 'updateCompleted' => __('Update completed.'),