From 45dfe8815fcd263881b09feef7773ebea59b795d Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Wed, 1 Apr 2015 16:33:32 +0000 Subject: [PATCH] Remove the JS part of [31619]. Fixes #6820. git-svn-id: https://develop.svn.wordpress.org/trunk@31960 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/media/views.js | 18 +----------------- src/wp-includes/js/media/views/attachment.js | 1 - .../js/media/views/attachment/details.js | 17 +---------------- src/wp-includes/media-template.php | 3 --- 4 files changed, 2 insertions(+), 37 deletions(-) diff --git a/src/wp-includes/js/media/views.js b/src/wp-includes/js/media/views.js index 3c37558736..ae2f97d27e 100644 --- a/src/wp-includes/js/media/views.js +++ b/src/wp-includes/js/media/views.js @@ -2640,7 +2640,6 @@ Attachment = View.extend({ this.listenTo( this.model, 'change', this.render ); } else { this.listenTo( this.model, 'change:percent', this.progress ); - this.listenTo( this.model, 'change:parent', this.render ); } this.listenTo( this.model, 'change:title', this._syncTitle ); this.listenTo( this.model, 'change:caption', this._syncCaption ); @@ -3180,8 +3179,7 @@ Details = Attachment.extend({ 'click .untrash-attachment': 'untrashAttachment', 'click .edit-attachment': 'editAttachment', 'click .refresh-attachment': 'refreshAttachment', - 'keydown': 'toggleSelectionHandler', - 'click .detach-from-parent': 'detachFromParent' + 'keydown': 'toggleSelectionHandler' }, initialize: function() { @@ -3280,20 +3278,6 @@ Details = Attachment.extend({ this.controller.trigger( 'attachment:keydown:arrow', event ); return; } - }, - - /** - * @param {Object} event - */ - detachFromParent: function( event ) { - event.preventDefault(); - - this.model.save({ - 'parent' : 0, - 'uploadedTo' : 0, - 'uploadedToLink' : '', - 'uploadedToTitle' : '' - }); } }); diff --git a/src/wp-includes/js/media/views/attachment.js b/src/wp-includes/js/media/views/attachment.js index ec6e616ef0..4744d0cb78 100644 --- a/src/wp-includes/js/media/views/attachment.js +++ b/src/wp-includes/js/media/views/attachment.js @@ -52,7 +52,6 @@ Attachment = View.extend({ this.listenTo( this.model, 'change', this.render ); } else { this.listenTo( this.model, 'change:percent', this.progress ); - this.listenTo( this.model, 'change:parent', this.render ); } this.listenTo( this.model, 'change:title', this._syncTitle ); this.listenTo( this.model, 'change:caption', this._syncCaption ); diff --git a/src/wp-includes/js/media/views/attachment/details.js b/src/wp-includes/js/media/views/attachment/details.js index 6989262079..68b0003a3b 100644 --- a/src/wp-includes/js/media/views/attachment/details.js +++ b/src/wp-includes/js/media/views/attachment/details.js @@ -35,8 +35,7 @@ Details = Attachment.extend({ 'click .untrash-attachment': 'untrashAttachment', 'click .edit-attachment': 'editAttachment', 'click .refresh-attachment': 'refreshAttachment', - 'keydown': 'toggleSelectionHandler', - 'click .detach-from-parent': 'detachFromParent' + 'keydown': 'toggleSelectionHandler' }, initialize: function() { @@ -135,20 +134,6 @@ Details = Attachment.extend({ this.controller.trigger( 'attachment:keydown:arrow', event ); return; } - }, - - /** - * @param {Object} event - */ - detachFromParent: function( event ) { - event.preventDefault(); - - this.model.save({ - 'parent' : 0, - 'uploadedTo' : 0, - 'uploadedToLink' : '', - 'uploadedToTitle' : '' - }); } }); diff --git a/src/wp-includes/media-template.php b/src/wp-includes/media-template.php index 4bbbfc1609..f5f024d354 100644 --- a/src/wp-includes/media-template.php +++ b/src/wp-includes/media-template.php @@ -418,9 +418,6 @@ function wp_print_media_templates() { <# } else { #> {{ data.uploadedToTitle }} <# } #> - <# if ( data.nonces.edit ) { #> - () - <# } #> <# } #>