<!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>[31619] trunk/src: Allow attachments to be Detached from their parent in media grid and list modes.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/31619">31619</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/31619","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-03-05 05:34:40 +0000 (Thu, 05 Mar 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Allow attachments to be Detached from their parent in media grid and list modes.
See <a href="https://core.trac.wordpress.org/ticket/6820">#6820</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswpmedialisttablephp">trunk/src/wp-admin/includes/class-wp-media-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludesmediaphp">trunk/src/wp-admin/includes/media.php</a></li>
<li><a href="#trunksrcwpadminuploadphp">trunk/src/wp-admin/upload.php</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentdetailsjs">trunk/src/wp-includes/js/media/views/attachment/details.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsattachmentjs">trunk/src/wp-includes/js/media/views/attachment.js</a></li>
<li><a href="#trunksrcwpincludesjsmediaviewsjs">trunk/src/wp-includes/js/media/views.js</a></li>
<li><a href="#trunksrcwpincludesmediatemplatephp">trunk/src/wp-includes/media-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2015-03-05 04:11:23 UTC (rev 31618)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2015-03-05 05:34:40 UTC (rev 31619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2267,6 +2267,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'attachment' != $post['post_type'] )
</span><span class="cx" style="display: block; padding: 0 10px"> wp_send_json_error();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $changes['parent'] ) )
+ $post['post_parent'] = $changes['parent'];
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $changes['title'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> $post['post_title'] = $changes['title'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswpmedialisttablephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/class-wp-media-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-03-05 04:11:23 UTC (rev 31618)
+++ trunk/src/wp-admin/includes/class-wp-media-list-table.php 2015-03-05 05:34:40 UTC (rev 31619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,6 +139,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['found_post_id'] ) && isset( $_REQUEST['media'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return 'attach';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $_REQUEST['parent_post_id'] ) && isset( $_REQUEST['media'] ) )
+ return 'detach';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return 'delete_all';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -406,7 +409,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> echo $title;
</span><span class="cx" style="display: block; padding: 0 10px"> } ?></strong>,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo get_the_time( __( 'Y/m/d' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php echo get_the_time( __( 'Y/m/d' ) ); ?><br />
+ <?php
+ if ( $user_can_edit ):
+ $detach_url = add_query_arg( array(
+ 'parent_post_id' => $post->post_parent,
+ 'media[]' => $post->ID,
+ '_wpnonce' => wp_create_nonce( 'bulk-' . $this->_args['plural'] )
+ ), 'upload.php' ); ?>
+ <a class="hide-if-no-js detach-from-parent" href="<?php echo $detach_url ?>"><?php _e( 'Detach' ); ?></a>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </td>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwpadminincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/media.php 2015-03-05 04:11:23 UTC (rev 31618)
+++ trunk/src/wp-admin/includes/media.php 2015-03-05 05:34:40 UTC (rev 31619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3010,3 +3010,61 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $metadata;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Encapsulate logic for Attach/Detach actions
+ *
+ * @since 4.2.0
+ *
+ * @global wpdb $wpdb
+ * @param int $parent_id
+ * @param string $action
+ */
+function wp_media_attach_action( $parent_id, $action = 'attach' ) {
+ global $wpdb;
+
+ if ( ! $parent_id ) {
+ return;
+ }
+
+ if ( ! current_user_can( 'edit_post', $parent_id ) ) {
+ wp_die( __( 'You are not allowed to edit this post.' ) );
+ }
+ $ids = array();
+ foreach ( (array) $_REQUEST['media'] as $att_id ) {
+ $att_id = (int) $att_id;
+
+ if ( ! current_user_can( 'edit_post', $att_id ) ) {
+ continue;
+ }
+
+ $ids[] = $att_id;
+ }
+
+ if ( ! empty( $ids ) ) {
+ $ids_string = implode( ',', $ids );
+ if ( 'attach' === $action ) {
+ $result = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $ids_string )", $parent_id ) );
+ } else {
+ $result = $wpdb->query( "UPDATE $wpdb->posts SET post_parent = 0 WHERE post_type = 'attachment' AND ID IN ( $ids_string )" );
+ }
+
+ foreach ( $ids as $att_id ) {
+ clean_attachment_cache( $att_id );
+ }
+ }
+
+ if ( isset( $result ) ) {
+ $location = 'upload.php';
+ if ( $referer = wp_get_referer() ) {
+ if ( false !== strpos( $referer, 'upload.php' ) ) {
+ $location = remove_query_arg( array( 'attached', 'detached' ), $referer );
+ }
+ }
+
+ $key = 'attach' === $action ? 'attached' : 'detached';
+ $location = add_query_arg( array( $key => $result ), $location );
+ wp_redirect( $location );
+ exit;
+ }
+}
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of file
</span></span></pre></div>
<a id="trunksrcwpadminuploadphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/upload.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upload.php 2015-03-05 04:11:23 UTC (rev 31618)
+++ trunk/src/wp-admin/upload.php 2015-03-05 05:34:40 UTC (rev 31619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,45 +113,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $doaction ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'detach':
+ wp_media_attach_action( $_REQUEST['parent_post_id'], 'detach' );
+ break;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'attach':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent_id = (int) $_REQUEST['found_post_id'];
- if ( !$parent_id )
- return;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_media_attach_action( $_REQUEST['found_post_id'] );
+ break;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $parent = get_post( $parent_id );
- if ( !current_user_can( 'edit_post', $parent_id ) )
- wp_die( __( 'You are not allowed to edit this post.' ) );
-
- $attach = array();
- foreach ( (array) $_REQUEST['media'] as $att_id ) {
- $att_id = (int) $att_id;
-
- if ( !current_user_can( 'edit_post', $att_id ) )
- continue;
-
- $attach[] = $att_id;
- }
-
- if ( ! empty( $attach ) ) {
- $attach_string = implode( ',', $attach );
- $attached = $wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_parent = %d WHERE post_type = 'attachment' AND ID IN ( $attach_string )", $parent_id ) );
- foreach ( $attach as $att_id ) {
- clean_attachment_cache( $att_id );
- }
- }
-
- if ( isset( $attached ) ) {
- $location = 'upload.php';
- if ( $referer = wp_get_referer() ) {
- if ( false !== strpos( $referer, 'upload.php' ) )
- $location = $referer;
- }
-
- $location = add_query_arg( array( 'attached' => $attached ) , $location );
- wp_redirect( $location );
- exit;
- }
- break;
</del><span class="cx" style="display: block; padding: 0 10px"> case 'trash':
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !isset( $post_ids ) )
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,9 +225,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( _n('Reattached %d attachment.', 'Reattached %d attachments.', $attached), $attached );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $_SERVER['REQUEST_URI'] = remove_query_arg(array('attached'), $_SERVER['REQUEST_URI']);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detached', 'attached' ), $_SERVER['REQUEST_URI'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( ! empty( $_GET['detached'] ) && $detached = absint( $_GET['detached'] ) ) {
+ $message = sprintf( _n( 'Detached %d attachment.', 'Detached %d attachments.', $detached ), $detached );
+ $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detached', 'attached' ), $_SERVER['REQUEST_URI'] );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $message = sprintf( _n( 'Media attachment permanently deleted.', '%d media attachments permanently deleted.', $deleted ), number_format_i18n( $_GET['deleted'] ) );
</span><span class="cx" style="display: block; padding: 0 10px"> $_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentdetailsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment/details.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment/details.js 2015-03-05 04:11:23 UTC (rev 31618)
+++ trunk/src/wp-includes/js/media/views/attachment/details.js 2015-03-05 05:34:40 UTC (rev 31619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -35,7 +35,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .untrash-attachment': 'untrashAttachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .edit-attachment': 'editAttachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .refresh-attachment': 'refreshAttachment',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'keydown': 'toggleSelectionHandler'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'keydown': 'toggleSelectionHandler',
+ 'click .detach-from-parent': 'detachFromParent'
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -134,6 +135,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.controller.trigger( 'attachment:keydown:arrow', event );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+
+ /**
+ * @param {Object} event
+ */
+ detachFromParent: function( event ) {
+ event.preventDefault();
+
+ this.model.save({
+ 'parent' : 0,
+ 'uploadedTo' : 0,
+ 'uploadedToLink' : '',
+ 'uploadedToTitle' : ''
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsattachmentjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views/attachment.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views/attachment.js 2015-03-05 04:11:23 UTC (rev 31618)
+++ trunk/src/wp-includes/js/media/views/attachment.js 2015-03-05 05:34:40 UTC (rev 31619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,6 +52,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.model, 'change', this.render );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.model, 'change:percent', this.progress );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.listenTo( this.model, 'change:parent', this.render );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.model, 'change:title', this._syncTitle );
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.model, 'change:caption', this._syncCaption );
</span></span></pre></div>
<a id="trunksrcwpincludesjsmediaviewsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/media/views.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/media/views.js 2015-03-05 04:11:23 UTC (rev 31618)
+++ trunk/src/wp-includes/js/media/views.js 2015-03-05 05:34:40 UTC (rev 31619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2656,6 +2656,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.model, 'change', this.render );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.model, 'change:percent', this.progress );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.listenTo( this.model, 'change:parent', this.render );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.model, 'change:title', this._syncTitle );
</span><span class="cx" style="display: block; padding: 0 10px"> this.listenTo( this.model, 'change:caption', this._syncCaption );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3195,7 +3196,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .untrash-attachment': 'untrashAttachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .edit-attachment': 'editAttachment',
</span><span class="cx" style="display: block; padding: 0 10px"> 'click .refresh-attachment': 'refreshAttachment',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'keydown': 'toggleSelectionHandler'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'keydown': 'toggleSelectionHandler',
+ 'click .detach-from-parent': 'detachFromParent'
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3294,6 +3296,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.controller.trigger( 'attachment:keydown:arrow', event );
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ },
+
+ /**
+ * @param {Object} event
+ */
+ detachFromParent: function( event ) {
+ event.preventDefault();
+
+ this.model.save({
+ 'parent' : 0,
+ 'uploadedTo' : 0,
+ 'uploadedToLink' : '',
+ 'uploadedToTitle' : ''
+ });
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesmediatemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media-template.php 2015-03-05 04:11:23 UTC (rev 31618)
+++ trunk/src/wp-includes/media-template.php 2015-03-05 05:34:40 UTC (rev 31619)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -418,6 +418,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="value">{{ data.uploadedToTitle }}</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# if ( data.nonces.edit ) { #>
+ <a class="detach-from-parent" data-id="{{ data.id }}" href="#">(<?php _e( 'Detach' ); ?>)</a>
+ <# } #>
</ins><span class="cx" style="display: block; padding: 0 10px"> </label>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="attachment-compat"></div>
</span></span></pre>
</div>
</div>
</body>
</html>