From 795c97d08bd9a8473dde8e9bc62afff87fc4abd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Helen=20Hou-Sand=C3=AD?= Date: Wed, 23 Jul 2014 22:09:18 +0000 Subject: [PATCH] Add support for `attachment_fields_to_edit` in the attachment details modal. props ericlewis. fixes #28991, see #24716. Built from https://develop.svn.wordpress.org/trunk@29278 git-svn-id: http://core.svn.wordpress.org/trunk@29060 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/js/media-grid.js | 12 +++++++++++- wp-includes/js/media-grid.min.js | 2 +- wp-includes/js/media-views.js | 2 ++ wp-includes/media-template.php | 1 + 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/wp-includes/js/media-grid.js b/wp-includes/js/media-grid.js index 449680b1ec..82d500b95e 100644 --- a/wp-includes/js/media-grid.js +++ b/wp-includes/js/media-grid.js @@ -440,6 +440,16 @@ controller: this, model: this.model }); + + /** + * Attach a subview to display fields added via the + * `attachment_fields_to_edit` filter. + */ + contentRegion.view.views.set( '.attachment-compat', new media.view.AttachmentCompat({ + controller: this, + model: this.model + }) ); + // Update browser url when navigating media details if ( this.model ) { this.gridRouter.navigate( this.gridRouter.baseUrl( '?item=' + this.model.id ) ); @@ -678,4 +688,4 @@ } }); -}(jQuery, _, Backbone, wp)); \ No newline at end of file +}(jQuery, _, Backbone, wp)); diff --git a/wp-includes/js/media-grid.min.js b/wp-includes/js/media-grid.min.js index b8ae5f11e8..4d023accff 100644 --- a/wp-includes/js/media-grid.min.js +++ b/wp-includes/js/media-grid.min.js @@ -1 +1 @@ -!function(a,b,c,d){var e,f=d.media;f.view.l10n?e=f.view.l10n:(e=f.view.l10n="undefined"==typeof _wpMediaViewsL10n?{}:_wpMediaViewsL10n,delete e.settings),f.controller.EditAttachmentMetadata=f.controller.State.extend({defaults:{id:"edit-attachment",title:e.attachmentDetails,content:"edit-metadata",menu:!1,toolbar:!1,router:!1}}),f.view.MediaFrame.Manage=f.view.MediaFrame.extend({initialize:function(){var c=this;b.defaults(this.options,{title:"",modal:!1,selection:[],library:{},multiple:"add",state:"library",uploader:!0,mode:["grid"]}),a(document).on("click",".add-new-h2",b.bind(this.addNewClickHandler,this)),this.$el.addClass("wp-core-ui"),(d.Uploader.limitExceeded||!d.Uploader.browser.supported)&&(this.options.uploader=!1),this.options.uploader&&(this.uploader=new f.view.UploaderWindow({controller:this,uploader:{dropzone:a("body"),container:a("body")}}).render(),this.uploader.ready(),a("body").append(this.uploader.el),this.options.uploader=!1),f.view.MediaFrame.prototype.initialize.apply(this,arguments),this.$el.appendTo(this.options.container),this.createStates(),this.bindRegionModeHandlers(),this.render(),a("#media-search-input").on("input",b.debounce(function(b){var d=a(b.currentTarget).val(),e="";d&&(e+="?search="+d),c.gridRouter.navigate(c.gridRouter.baseUrl(e))},1e3)),b.delay(b.bind(this.createRouter,this),1e3)},createRouter:function(){this.gridRouter=new f.view.MediaFrame.Manage.Router,window.history&&window.history.pushState&&c.history.start({root:_wpMediaGridSettings.adminUrl,pushState:!0})},createStates:function(){var a=this.options;this.options.states||this.states.add([new f.controller.Library({library:f.query(a.library),multiple:a.multiple,title:a.title,content:"browse",filterable:"mime-types"})])},bindRegionModeHandlers:function(){this.on("content:create:browse",this.browseContent,this),this.on("edit:attachment",this.openEditAttachmentModal,this)},addNewClickHandler:function(a){a.preventDefault(),this.trigger("toggle:upload:attachment")},openEditAttachmentModal:function(a){d.media({frame:"edit-attachments",gridRouter:this.gridRouter,library:this.state().get("library"),model:a})},browseContent:function(a){var b=this.state();a.view=new f.view.AttachmentsBrowser({controller:this,collection:b.get("library"),selection:b.get("selection"),model:b,sortable:b.get("sortable"),search:b.get("searchable"),filters:b.get("filterable"),display:b.get("displaySettings"),dragInfo:b.get("dragInfo"),sidebar:!1,suggestedWidth:b.get("suggestedWidth"),suggestedHeight:b.get("suggestedHeight"),AttachmentView:b.get("AttachmentView")})}}),f.view.Attachment.Details.TwoColumn=f.view.Attachment.Details.extend({template:f.template("attachment-details-two-column"),preDestroy:function(a){a.preventDefault(),this.lastIndex=this.controller.getCurrentIndex(),this.hasNext=this.controller.hasNext()},trashAttachment:function(a){this.preDestroy(a),f.view.Attachment.Details.prototype.trashAttachment.apply(this,arguments)},deleteAttachment:function(a){this.preDestroy(a),f.view.Attachment.Details.prototype.deleteAttachment.apply(this,arguments)},editAttachment:function(a){a.preventDefault(),this.controller.setState("edit-image")},toggleSelectionHandler:function(){},afterDelete:function(a){if(a.destroyed){var b=this.controller,c=this.lastIndex;if(!b.library.length)return void f.frame.modal.close();this.hasNext&&(c-=1),b.model=b.library.at(c),b.nextMediaItem()}},render:function(){f.view.Attachment.Details.prototype.render.apply(this,arguments),f.mixin.removeAllPlayers(),this.$("audio, video").each(function(a,b){var c=f.view.MediaDetails.prepareSrc(b);new MediaElementPlayer(c,f.mixin.mejsSettings)})}}),f.view.MediaFrame.Manage.Router=c.Router.extend({routes:{"upload.php?item=:slug":"showItem","upload.php?search=:query":"search",":default":"defaultRoute"},baseUrl:function(a){return"upload.php"+a},search:function(b){this.closeModal(),a("#media-search-input").val(b).trigger("input")},showItem:function(a){var b=f.frame.state().get("library");this.closeModal(),f.frame.trigger("edit:attachment",b.findWhere({id:parseInt(a,10)}))},closeModal:function(){f.frame.modal&&f.frame.modal.close()},defaultRoute:function(){this.closeModal(),a("#media-search-input").val("").trigger("input")}}),f.view.MediaFrame.EditAttachments=f.view.MediaFrame.extend({className:"edit-attachment-frame",template:f.template("edit-attachment-frame"),regions:["title","content"],events:{click:"collapse","click .delete-media-item":"deleteMediaItem","click .left":"previousMediaItem","click .right":"nextMediaItem"},initialize:function(){var c=this;f.view.Frame.prototype.initialize.apply(this,arguments),b.defaults(this.options,{modal:!0,state:"edit-attachment"}),this.gridRouter=this.options.gridRouter,this.library=this.options.library,this.model=this.options.model?this.options.model:this.library.at(0),this.createStates(),this.on("content:create:edit-metadata",this.editMetadataMode,this),this.on("content:create:edit-image",this.editImageMode,this),this.on("close",this.detach),this.on("title:create:default",this.createTitle,this),this.title.mode("default"),this.options.hasPrevious=this.hasPrevious(),this.options.hasNext=this.hasNext(),this.options.modal&&(this.modal=new f.view.Modal({controller:this,title:this.options.title}),this.modal.on("open",function(){a("body").on("keydown.media-modal",b.bind(c.keyEvent,c))}),this.modal.on("close",function(){c.modal.remove(),a("body").off("keydown.media-modal"),c.resetRoute()}),this.modal.content(this),this.modal.open())},createStates:function(){var a=new f.controller.EditImage({model:this.model});a._toolbar=function(){},a._router=function(){},a._menu=function(){},this.states.add([new f.controller.EditAttachmentMetadata({model:this.model}),a])},editMetadataMode:function(a){a.view=new f.view.Attachment.Details.TwoColumn({controller:this,model:this.model}),this.model&&this.gridRouter.navigate(this.gridRouter.baseUrl("?item="+this.model.id))},editImageMode:function(a){a.view=new f.view.EditImage({model:this.model,controller:this}),b.defer(b.bind(a.view.loadEditor,a.view))},resetContent:function(){this.modal.close(),d.media({frame:"edit-attachments",gridRouter:this.gridRouter,library:this.library,model:this.model})},previousMediaItem:function(){this.hasPrevious()&&(this.model=this.library.at(this.getCurrentIndex()-1),this.resetContent())},nextMediaItem:function(){this.hasNext()&&(this.model=this.library.at(this.getCurrentIndex()+1),this.resetContent())},getCurrentIndex:function(){return this.library.indexOf(this.model)},hasNext:function(){return this.getCurrentIndex()+1-1},keyEvent:function(b){var c=a(b.target);return 27===b.keyCode?(this.resetRoute(),b):c.is("input")||c.is("textarea")?b:(39===b.keyCode&&this.nextMediaItem(),void(37===b.keyCode&&this.previousMediaItem()))},resetRoute:function(){this.gridRouter.navigate(this.gridRouter.baseUrl(""))}}),f.view.BulkSelection=f.View.extend({className:"bulk-select",initialize:function(){this.model=new c.Model({currentAction:""}),this.views.add(new f.view.BulkSelectionActionDropdown({controller:this})),this.views.add(new f.view.BulkSelectionActionButton({disabled:!0,text:e.apply,controller:this}))}}),f.view.BulkSelectionActionDropdown=f.View.extend({tagName:"select",initialize:function(){f.view.Button.prototype.initialize.apply(this,arguments),this.listenTo(this.controller.controller.state().get("selection"),"add remove reset",b.bind(this.enabled,this)),this.$el.append(a("").val("").html(e.bulkActions)).append(a("").val("delete").html(e.deletePermanently)),this.$el.prop("disabled",!0),this.$el.on("change",b.bind(this.changeHandler,this))},changeHandler:function(){this.controller.model.set({currentAction:this.$el.val()})},enabled:function(){var a=!this.controller.controller.state().get("selection").length;this.$el.prop("disabled",a)}}),f.view.BulkSelectionActionButton=f.view.Button.extend({tagName:"button",initialize:function(){f.view.Button.prototype.initialize.apply(this,arguments),this.listenTo(this.controller.model,"change",this.enabled,this),this.listenTo(this.controller.controller.state().get("selection"),"add remove reset",b.bind(this.enabled,this))},click:function(){var a=this.controller.controller.state().get("selection");if(f.view.Button.prototype.click.apply(this,arguments),confirm(e.warnBulkDelete))for(;a.length>0;)a.at(0).destroy();this.enabled()},enabled:function(){var a=this.controller.model.get("currentAction"),b=this.controller.controller.state().get("selection"),c=!a||!b.length;this.$el.prop("disabled",c)}}),f.view.DateFilter=f.view.AttachmentFilters.extend({id:"media-attachment-date-filters",createFilters:function(){var a={};b.each(f.view.settings.months||{},function(b,c){a[c]={text:b.text,props:{year:b.year,monthnum:b.month}}}),a.all={text:e.allDates,props:{monthnum:!1,year:!1},priority:10},this.filters=a}})}(jQuery,_,Backbone,wp); \ No newline at end of file +!function(a,b,c,d){var e,f=d.media;f.view.l10n?e=f.view.l10n:(e=f.view.l10n="undefined"==typeof _wpMediaViewsL10n?{}:_wpMediaViewsL10n,delete e.settings),f.controller.EditAttachmentMetadata=f.controller.State.extend({defaults:{id:"edit-attachment",title:e.attachmentDetails,content:"edit-metadata",menu:!1,toolbar:!1,router:!1}}),f.view.MediaFrame.Manage=f.view.MediaFrame.extend({initialize:function(){var c=this;b.defaults(this.options,{title:"",modal:!1,selection:[],library:{},multiple:"add",state:"library",uploader:!0,mode:["grid"]}),a(document).on("click",".add-new-h2",b.bind(this.addNewClickHandler,this)),this.$el.addClass("wp-core-ui"),(d.Uploader.limitExceeded||!d.Uploader.browser.supported)&&(this.options.uploader=!1),this.options.uploader&&(this.uploader=new f.view.UploaderWindow({controller:this,uploader:{dropzone:a("body"),container:a("body")}}).render(),this.uploader.ready(),a("body").append(this.uploader.el),this.options.uploader=!1),f.view.MediaFrame.prototype.initialize.apply(this,arguments),this.$el.appendTo(this.options.container),this.createStates(),this.bindRegionModeHandlers(),this.render(),a("#media-search-input").on("input",b.debounce(function(b){var d=a(b.currentTarget).val(),e="";d&&(e+="?search="+d),c.gridRouter.navigate(c.gridRouter.baseUrl(e))},1e3)),b.delay(b.bind(this.createRouter,this),1e3)},createRouter:function(){this.gridRouter=new f.view.MediaFrame.Manage.Router,window.history&&window.history.pushState&&c.history.start({root:_wpMediaGridSettings.adminUrl,pushState:!0})},createStates:function(){var a=this.options;this.options.states||this.states.add([new f.controller.Library({library:f.query(a.library),multiple:a.multiple,title:a.title,content:"browse",filterable:"mime-types"})])},bindRegionModeHandlers:function(){this.on("content:create:browse",this.browseContent,this),this.on("edit:attachment",this.openEditAttachmentModal,this)},addNewClickHandler:function(a){a.preventDefault(),this.trigger("toggle:upload:attachment")},openEditAttachmentModal:function(a){d.media({frame:"edit-attachments",gridRouter:this.gridRouter,library:this.state().get("library"),model:a})},browseContent:function(a){var b=this.state();a.view=new f.view.AttachmentsBrowser({controller:this,collection:b.get("library"),selection:b.get("selection"),model:b,sortable:b.get("sortable"),search:b.get("searchable"),filters:b.get("filterable"),display:b.get("displaySettings"),dragInfo:b.get("dragInfo"),sidebar:!1,suggestedWidth:b.get("suggestedWidth"),suggestedHeight:b.get("suggestedHeight"),AttachmentView:b.get("AttachmentView")})}}),f.view.Attachment.Details.TwoColumn=f.view.Attachment.Details.extend({template:f.template("attachment-details-two-column"),preDestroy:function(a){a.preventDefault(),this.lastIndex=this.controller.getCurrentIndex(),this.hasNext=this.controller.hasNext()},trashAttachment:function(a){this.preDestroy(a),f.view.Attachment.Details.prototype.trashAttachment.apply(this,arguments)},deleteAttachment:function(a){this.preDestroy(a),f.view.Attachment.Details.prototype.deleteAttachment.apply(this,arguments)},editAttachment:function(a){a.preventDefault(),this.controller.setState("edit-image")},toggleSelectionHandler:function(){},afterDelete:function(a){if(a.destroyed){var b=this.controller,c=this.lastIndex;if(!b.library.length)return void f.frame.modal.close();this.hasNext&&(c-=1),b.model=b.library.at(c),b.nextMediaItem()}},render:function(){f.view.Attachment.Details.prototype.render.apply(this,arguments),f.mixin.removeAllPlayers(),this.$("audio, video").each(function(a,b){var c=f.view.MediaDetails.prepareSrc(b);new MediaElementPlayer(c,f.mixin.mejsSettings)})}}),f.view.MediaFrame.Manage.Router=c.Router.extend({routes:{"upload.php?item=:slug":"showItem","upload.php?search=:query":"search",":default":"defaultRoute"},baseUrl:function(a){return"upload.php"+a},search:function(b){this.closeModal(),a("#media-search-input").val(b).trigger("input")},showItem:function(a){var b=f.frame.state().get("library");this.closeModal(),f.frame.trigger("edit:attachment",b.findWhere({id:parseInt(a,10)}))},closeModal:function(){f.frame.modal&&f.frame.modal.close()},defaultRoute:function(){this.closeModal(),a("#media-search-input").val("").trigger("input")}}),f.view.MediaFrame.EditAttachments=f.view.MediaFrame.extend({className:"edit-attachment-frame",template:f.template("edit-attachment-frame"),regions:["title","content"],events:{click:"collapse","click .delete-media-item":"deleteMediaItem","click .left":"previousMediaItem","click .right":"nextMediaItem"},initialize:function(){var c=this;f.view.Frame.prototype.initialize.apply(this,arguments),b.defaults(this.options,{modal:!0,state:"edit-attachment"}),this.gridRouter=this.options.gridRouter,this.library=this.options.library,this.model=this.options.model?this.options.model:this.library.at(0),this.createStates(),this.on("content:create:edit-metadata",this.editMetadataMode,this),this.on("content:create:edit-image",this.editImageMode,this),this.on("close",this.detach),this.on("title:create:default",this.createTitle,this),this.title.mode("default"),this.options.hasPrevious=this.hasPrevious(),this.options.hasNext=this.hasNext(),this.options.modal&&(this.modal=new f.view.Modal({controller:this,title:this.options.title}),this.modal.on("open",function(){a("body").on("keydown.media-modal",b.bind(c.keyEvent,c))}),this.modal.on("close",function(){c.modal.remove(),a("body").off("keydown.media-modal"),c.resetRoute()}),this.modal.content(this),this.modal.open())},createStates:function(){var a=new f.controller.EditImage({model:this.model});a._toolbar=function(){},a._router=function(){},a._menu=function(){},this.states.add([new f.controller.EditAttachmentMetadata({model:this.model}),a])},editMetadataMode:function(a){a.view=new f.view.Attachment.Details.TwoColumn({controller:this,model:this.model}),a.view.views.set(".attachment-compat",new f.view.AttachmentCompat({controller:this,model:this.model})),this.model&&this.gridRouter.navigate(this.gridRouter.baseUrl("?item="+this.model.id))},editImageMode:function(a){a.view=new f.view.EditImage({model:this.model,controller:this}),b.defer(b.bind(a.view.loadEditor,a.view))},resetContent:function(){this.modal.close(),d.media({frame:"edit-attachments",gridRouter:this.gridRouter,library:this.library,model:this.model})},previousMediaItem:function(){this.hasPrevious()&&(this.model=this.library.at(this.getCurrentIndex()-1),this.resetContent())},nextMediaItem:function(){this.hasNext()&&(this.model=this.library.at(this.getCurrentIndex()+1),this.resetContent())},getCurrentIndex:function(){return this.library.indexOf(this.model)},hasNext:function(){return this.getCurrentIndex()+1-1},keyEvent:function(b){var c=a(b.target);return 27===b.keyCode?(this.resetRoute(),b):c.is("input")||c.is("textarea")?b:(39===b.keyCode&&this.nextMediaItem(),void(37===b.keyCode&&this.previousMediaItem()))},resetRoute:function(){this.gridRouter.navigate(this.gridRouter.baseUrl(""))}}),f.view.BulkSelection=f.View.extend({className:"bulk-select",initialize:function(){this.model=new c.Model({currentAction:""}),this.views.add(new f.view.BulkSelectionActionDropdown({controller:this})),this.views.add(new f.view.BulkSelectionActionButton({disabled:!0,text:e.apply,controller:this}))}}),f.view.BulkSelectionActionDropdown=f.View.extend({tagName:"select",initialize:function(){f.view.Button.prototype.initialize.apply(this,arguments),this.listenTo(this.controller.controller.state().get("selection"),"add remove reset",b.bind(this.enabled,this)),this.$el.append(a("").val("").html(e.bulkActions)).append(a("").val("delete").html(e.deletePermanently)),this.$el.prop("disabled",!0),this.$el.on("change",b.bind(this.changeHandler,this))},changeHandler:function(){this.controller.model.set({currentAction:this.$el.val()})},enabled:function(){var a=!this.controller.controller.state().get("selection").length;this.$el.prop("disabled",a)}}),f.view.BulkSelectionActionButton=f.view.Button.extend({tagName:"button",initialize:function(){f.view.Button.prototype.initialize.apply(this,arguments),this.listenTo(this.controller.model,"change",this.enabled,this),this.listenTo(this.controller.controller.state().get("selection"),"add remove reset",b.bind(this.enabled,this))},click:function(){var a=this.controller.controller.state().get("selection");if(f.view.Button.prototype.click.apply(this,arguments),confirm(e.warnBulkDelete))for(;a.length>0;)a.at(0).destroy();this.enabled()},enabled:function(){var a=this.controller.model.get("currentAction"),b=this.controller.controller.state().get("selection"),c=!a||!b.length;this.$el.prop("disabled",c)}}),f.view.DateFilter=f.view.AttachmentFilters.extend({id:"media-attachment-date-filters",createFilters:function(){var a={};b.each(f.view.settings.months||{},function(b,c){a[c]={text:b.text,props:{year:b.year,monthnum:b.month}}}),a.all={text:e.allDates,props:{monthnum:!1,year:!1},priority:10},this.filters=a}})}(jQuery,_,Backbone,wp); \ No newline at end of file diff --git a/wp-includes/js/media-views.js b/wp-includes/js/media-views.js index ef3e787ade..f034d2047b 100644 --- a/wp-includes/js/media-views.js +++ b/wp-includes/js/media-views.js @@ -6407,6 +6407,8 @@ /** * wp.media.view.AttachmentCompat * + * A view to display fields added via the `attachment_fields_to_edit` filter. + * * @constructor * @augments wp.media.View * @augments wp.Backbone.View diff --git a/wp-includes/media-template.php b/wp-includes/media-template.php index b130c4c16b..edea01273b 100644 --- a/wp-includes/media-template.php +++ b/wp-includes/media-template.php @@ -386,6 +386,7 @@ function wp_print_media_templates() { {{ data.uploadedToTitle }} <# } #> +
|