+
+
-
+
+
+
+
+
-
+
Index: wp-admin/js/gallery.js
===================================================================
--- wp-admin/js/gallery.js (revision 9036)
+++ wp-admin/js/gallery.js (working copy)
@@ -1,22 +1,44 @@
jQuery(function($) {
var gallerySortable;
+
var gallerySortableInit = function() {
gallerySortable = $('#media-items').sortable( {
items: '.media-item',
placeholder: 'sorthelper',
axis: 'y',
distance: 2,
- update: galleryReorder
+ update: galleryHandle,
} );
}
-
- // When an update has occurred, adjust the order for each item
+
+ var galleryHandle = function (e, sort) {
+ galleryReorder(e, sort);
+ gallerySortGroups();
+ }
+
+ // @todo: fix me!
+ // When an update has occurred, adjust the order for each item..
var galleryReorder = function(e, sort) {
+ var o = 0;
jQuery.each(sort['element'].sortable('toArray'), function(i, id) {
- jQuery('#' + id + ' .menu_order input')[0].value = (1+i);
+ if (id)
+ {
+ o++;
+ jQuery('#' + id + ' .menu_order input')[0].value = o;
+ }
});
}
-
+
+ var gallerySortGroups = function () {
+ var mediaGroups = jQuery(".media-groups").length;
+ for (g = 0; g < mediaGroups; g++)
+ {
+ jQuery.each(jQuery("#media-group-" + g + " .media-item input.group-value"), function(i, id) {
+ jQuery(id)[0].value = g;
+ });
+ }
+ }
+
// initialize sortable
gallerySortableInit();
});
Index: wp-includes/js/swfupload/handlers.js
===================================================================
--- wp-includes/js/swfupload/handlers.js (revision 9036)
+++ wp-includes/js/swfupload/handlers.js (working copy)
@@ -126,16 +126,23 @@
}
// Only show Save buttons when there is at least one file.
- if ( jQuery('#media-items>*').not('.media-blank').length > 0 )
+ if ( jQuery('#media-items .media-item').not('.media-no-items').length > 0 )
jQuery('.savebutton').show();
else
jQuery('.savebutton').hide();
+ // Only show new Gallery button when there are at least two files.
+ if ( jQuery('#media-items .media-item').not('.media-no-items').length > 1 )
+ jQuery('.new-gallery').show();
+ else
+ jQuery('.new-gallery').hide();
+
// Only show Gallery button when there are at least two files.
- if ( jQuery('#media-items>*').length > 1 )
+ if ( jQuery('#media-items .media-groups').length > 1 )
jQuery('.insert-gallery').show();
else
jQuery('.insert-gallery').hide();
+
}
function uploadSuccess(fileObj, serverData) {
Index: wp-includes/media.php
===================================================================
--- wp-includes/media.php (revision 9036)
+++ wp-includes/media.php (working copy)
@@ -617,12 +617,13 @@
'icontag' => 'dt',
'captiontag' => 'dd',
'columns' => 3,
+ 'group' => null,
'size' => 'thumbnail',
), $attr));
$id = intval($id);
- $attachments = get_children( array('post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
-
+ $attachments = get_attachments( $post->ID, $group, array('post_status' => 'inherit', 'post_mime_type' => 'image', 'order' => $order, 'orderby' => $orderby) );
+
if ( empty($attachments) )
return '';
Index: wp-includes/post.php
===================================================================
--- wp-includes/post.php (revision 9036)
+++ wp-includes/post.php (working copy)
@@ -69,6 +69,143 @@
}
/**
+ * Get the posts attachments data.
+ *
+ * @since 2.7.0
+ *
+ * @param int $post_id Post ID
+ */
+function _get_attachment_data ( $post_id ) {
+ global $wpdb;
+
+ $_attchments = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = '_wp_post_attachments' LIMIT 1", $post_id));
+ return unserialize($_attchments->meta_value);
+}
+/**
+ * Get the posts attachments.
+ *
+ * @since 2.7.0
+ *
+ * @param int $post_id Post ID
+ * @param int $group_num Group Number
+ * @param mixed $args Optional. User defined arguments for replacing the defaults.
+ */
+function &get_attachments( $post_id, $group_num = null, $args = '' ) {
+
+ $attachment = _get_attachment_data ( $post_id );
+
+ foreach ( $attachment as $key => $group ) {
+
+ if (!is_null($group_num))
+ if ($key != $group_num) { continue; }
+
+ if ( !is_array($group['items']) )
+ break;
+
+ foreach ( $group['items'] as $item => $attachment_id ) {
+ $p = get_post( $attachment_id );
+ $p->group_number = $key;
+
+ $attach[$attachment_id] = $p;
+ }
+ }
+
+ // @todo Orginize items based on the settings either default or user
+
+ return $attach;
+}
+
+/**
+ * Get the gallery groups names.
+ *
+ * @since 2.7.0
+ *
+ * @param int $post_id Post ID
+ */
+function &get_attachments_groupsname( $post_id ) {
+
+ $attachment = _get_attachment_data ( $post_id );
+
+ if ( !is_array($attachment) )
+ return '';
+
+ foreach ( $attachment as $key => $group ) {
+ $groups[$key] = $group['name'];
+ }
+
+ return $groups;
+}
+
+/**
+ * Get the number of groups attached to this post.
+ *
+ * @since 2.7.0
+ *
+ * @param int $post_id Post ID
+ */
+function get_attachment_groups( $post_id ) {
+
+ return count(_get_attachment_data ( $post_id ));
+}
+
+/**
+ * Insert a new gallery into the post.
+ *
+ * @since 2.7.0
+ *
+ * @param int $post_id post data
+*/
+function wp_new_gallery ( $post_id ) {
+
+ $attachment = _get_attachment_data ( $post_id );
+
+ foreach ( $attachment as $key => $group )
+ $_group[$key] = array ('name' => $group['name'], 'items' => $group['items']);
+
+ $_group[] = array ('name' => null, 'items' => null);
+
+ update_post_meta( $post_id, '_wp_post_attachments', $_group );
+
+}
+
+/**
+ * We are deleting a gallery and moving
+ *
+ * @since 2.7.0
+ *
+ * @param int $post_id Post ID
+ * @param int $group_number Group Number
+*/
+function wp_delete_gallery ( $post_id, $group_num ) {
+
+ $attachment = _get_attachment_data ( $post_id );
+
+ foreach ( $attachment as $key => $group ) {
+ if ($key != $group_num) {
+ $_group[$key] = array ('name' => $group['name'], 'items' => $group['items']);
+ continue;
+ }
+
+ if ( !is_array($group['items']) )
+ break;
+
+ foreach ( $group['items'] as $item => $attachment_id ) {
+ $_attach[] = $attachment_id;
+ }
+ }
+
+ if ( is_array($_group[0]['items']) && is_array($_attach) ) {
+ $i = array_merge($_group[0]['items'], $_attach);
+ $_group[0] = array ('name' => null, 'items' => $i);
+ } else {
+ $_group[0] = array ('name' => null, 'items' => $_group[0]['items']);
+ }
+
+ update_post_meta( $post_id, '_wp_post_attachments', $_group );
+
+}
+
+/**
* Retrieve all children of the post parent ID.
*
* Normally, without any enhancements, the children would apply to pages. In the