<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[22568] trunk: Media: Make edit gallery button use new media.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/22568">22568</a></dd>
<dt>Author</dt> <dd>koopersmith</dd>
<dt>Date</dt> <dd>2012-11-14 09:06:10 +0000 (Wed, 14 Nov 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media: Make edit gallery button use new media. see <a href="http://core.trac.wordpress.org/ticket/21390">#21390</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminjsmediauploadjs">trunk/wp-admin/js/media-upload.js</a></li>
<li><a href="#trunkwpincludesjstinymcepluginswpgalleryeditor_plugin_srcjs">trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (22567 => 22568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2012-11-14 07:17:22 UTC (rev 22567)
+++ trunk/wp-admin/includes/media.php 2012-11-14 09:06:10 UTC (rev 22568)
</span><span class="lines">@@ -383,7 +383,9 @@
</span><span class="cx"> * @param string $editor_id
</span><span class="cx"> */
</span><span class="cx"> function media_buttons($editor_id = 'content') {
</span><del>- wp_enqueue_media();
</del><ins>+ wp_enqueue_media( array(
+ 'post' => get_post()
+ ) );
</ins><span class="cx">
</span><span class="cx"> $context = apply_filters('media_buttons_context', __('Upload/Insert %s'));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminjsmediauploadjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/js/media-upload.js (22567 => 22568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/js/media-upload.js 2012-11-14 07:17:22 UTC (rev 22567)
+++ trunk/wp-admin/js/media-upload.js 2012-11-14 09:06:10 UTC (rev 22568)
</span><span class="lines">@@ -212,7 +212,18 @@
</span><span class="cx"> var galleries = {};
</span><span class="cx">
</span><span class="cx"> return {
</span><del>- attachments: function( shortcode, parent ) {
</del><ins>+ defaults: {
+ order: 'ASC',
+ orderby: 'post__in',
+ id: wp.media.view.settings.postId,
+ itemtag: 'dl',
+ icontag: 'dt',
+ captiontag: 'dd',
+ columns: 3,
+ size: 'thumbnail'
+ },
+
+ attachments: function( shortcode ) {
</ins><span class="cx"> var shortcodeString = shortcode.string(),
</span><span class="cx"> result = galleries[ shortcodeString ],
</span><span class="cx"> attrs, args, query, others;
</span><span class="lines">@@ -240,7 +251,7 @@
</span><span class="cx"> args.post__not_in = attrs.exclude.split(',');
</span><span class="cx">
</span><span class="cx"> if ( ! args.post__in )
</span><del>- args.parent = attrs.id || parent;
</del><ins>+ args.parent = attrs.id;
</ins><span class="cx">
</span><span class="cx"> // Collect the attributes that were not included in `args`.
</span><span class="cx"> others = {};
</span><span class="lines">@@ -283,6 +294,40 @@
</span><span class="cx"> galleries[ shortcode.string() ] = clone;
</span><span class="cx">
</span><span class="cx"> return shortcode;
</span><ins>+ },
+
+ edit: function( content ) {
+ var shortcode = wp.shortcode.next( 'gallery', content ),
+ defaultPostId = wp.media.gallery.defaults.postId,
+ attachments, selection;
+
+ // Bail if we didn't match the shortcode or all of the content.
+ if ( ! shortcode || shortcode.content !== content )
+ return;
+
+ // Ignore the rest of the match object.
+ shortcode = shortcode.shortcode;
+
+ if ( _.isUndefined( shortcode.get('id') ) && ! _.isUndefined( defaultPostId ) )
+ shortcode.set( 'id', defaultPostId );
+
+ attachments = wp.media.gallery.attachments( shortcode );
+
+ selection = new wp.media.model.Selection( attachments.models, {
+ props: attachments.props.toJSON(),
+ multiple: true
+ });
+
+ selection.gallery = attachments.gallery;
+
+ return wp.media({
+ frame: 'post',
+ state: 'gallery-edit',
+ title: wp.media.view.l10n.editGalleryTitle,
+ editing: true,
+ multiple: true,
+ selection: selection
+ });
</ins><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx"> }());
</span></span></pre></div>
<a id="trunkwpincludesjstinymcepluginswpgalleryeditor_plugin_srcjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js (22567 => 22568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js 2012-11-14 07:17:22 UTC (rev 22567)
+++ trunk/wp-includes/js/tinymce/plugins/wpgallery/editor_plugin_src.js 2012-11-14 09:06:10 UTC (rev 22568)
</span><span class="lines">@@ -10,16 +10,24 @@
</span><span class="cx">
</span><span class="cx"> // Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('...');
</span><span class="cx"> ed.addCommand('WP_Gallery', function() {
</span><del>- var el = ed.selection.getNode(), post_id, vp = tinymce.DOM.getViewPort(),
- H = vp.h - 80, W = ( 640 < vp.w ) ? 640 : vp.w;
</del><ins>+ var el = ed.selection.getNode(),
+ gallery = wp.media.gallery,
+ frame;
</ins><span class="cx">
</span><del>- if ( el.nodeName != 'IMG' ) return;
- if ( ed.dom.getAttrib(el, 'class').indexOf('wpGallery') == -1 ) return;
</del><ins>+ // Check if the `wp.media.gallery` API exists.
+ if ( typeof wp === 'undefined' || ! wp.media || ! wp.media.gallery )
+ return;
</ins><span class="cx">
</span><del>- post_id = tinymce.DOM.get('post_ID').value;
- tb_show('', tinymce.documentBaseURL + 'media-upload.php?post_id='+post_id+'&tab=gallery&TB_iframe=true&width='+W+'&height='+H);
</del><ins>+ // Make sure we've selected a gallery node.
+ if ( el.nodeName != 'IMG' || ed.dom.getAttrib(el, 'class').indexOf('wpGallery') == -1 )
+ return;
</ins><span class="cx">
</span><del>- tinymce.DOM.setStyle( ['TB_overlay','TB_window','TB_load'], 'z-index', '999999' );
</del><ins>+ frame = gallery.edit( '[' + ed.dom.getAttrib( el, 'title' ) + ']' );
+
+ frame.get('gallery-edit').on( 'update', function( selection ) {
+ var shortcode = gallery.shortcode( selection ).string().slice( 1, -1 );
+ ed.dom.setAttrib( el, 'title', shortcode );
+ });
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> ed.onMouseDown.add(function(ed, e) {
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (22567 => 22568)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2012-11-14 07:17:22 UTC (rev 22567)
+++ trunk/wp-includes/media.php 2012-11-14 09:06:10 UTC (rev 22568)
</span><span class="lines">@@ -1300,7 +1300,12 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.5.0
</span><span class="cx"> */
</span><del>-function wp_enqueue_media() {
</del><ins>+function wp_enqueue_media( $args = array() ) {
+ $defaults = array(
+ 'post' => null,
+ );
+ $args = wp_parse_args( $args, $defaults );
+
</ins><span class="cx"> // We're going to pass the old thickbox media tabs to `media_upload_tabs`
</span><span class="cx"> // to ensure plugins will work. We will then unset those tabs.
</span><span class="cx"> $tabs = array(
</span><span class="lines">@@ -1321,6 +1326,9 @@
</span><span class="cx"> ), admin_url('media-upload.php') ),
</span><span class="cx"> );
</span><span class="cx">
</span><ins>+ if ( isset( $args['post'] ) )
+ $settings['postId'] = get_post( $args['post'] )->ID;
+
</ins><span class="cx"> wp_localize_script( 'media-views', '_wpMediaViewsL10n', array(
</span><span class="cx"> // Settings
</span><span class="cx"> 'settings' => $settings,
</span></span></pre>
</div>
</div>
</body>
</html>