diff -r 34716fd837a4 -r be944660c56a wp/wp-includes/js/media-grid.js --- a/wp/wp-includes/js/media-grid.js Tue Dec 15 15:52:01 2020 +0100 +++ b/wp/wp-includes/js/media-grid.js Wed Sep 21 18:19:35 2022 +0200 @@ -81,29 +81,249 @@ /******/ /******/ /******/ // Load entry module and return exports -/******/ return __webpack_require__(__webpack_require__.s = 11); +/******/ return __webpack_require__(__webpack_require__.s = 1); /******/ }) /************************************************************************/ -/******/ ([ -/* 0 */, -/* 1 */, -/* 2 */, -/* 3 */, -/* 4 */, -/* 5 */, -/* 6 */, -/* 7 */, -/* 8 */, -/* 9 */, -/* 10 */, -/* 11 */ +/******/ ({ + +/***/ 1: /***/ (function(module, exports, __webpack_require__) { -module.exports = __webpack_require__(12); +module.exports = __webpack_require__("LRQ5"); + + +/***/ }), + +/***/ "1lLZ": +/***/ (function(module, exports) { + +var Button = wp.media.view.Button, + DeleteSelected = wp.media.view.DeleteSelectedButton, + DeleteSelectedPermanently; + +/** + * wp.media.view.DeleteSelectedPermanentlyButton + * + * When MEDIA_TRASH is true, a button that handles bulk Delete Permanently logic + * + * @memberOf wp.media.view + * + * @class + * @augments wp.media.view.DeleteSelectedButton + * @augments wp.media.view.Button + * @augments wp.media.View + * @augments wp.Backbone.View + * @augments Backbone.View + */ +DeleteSelectedPermanently = DeleteSelected.extend(/** @lends wp.media.view.DeleteSelectedPermanentlyButton.prototype */{ + initialize: function() { + DeleteSelected.prototype.initialize.apply( this, arguments ); + this.controller.on( 'select:activate', this.selectActivate, this ); + this.controller.on( 'select:deactivate', this.selectDeactivate, this ); + }, + + filterChange: function( model ) { + this.canShow = ( 'trash' === model.get( 'status' ) ); + }, + + selectActivate: function() { + this.toggleDisabled(); + this.$el.toggleClass( 'hidden', ! this.canShow ); + }, + + selectDeactivate: function() { + this.toggleDisabled(); + this.$el.addClass( 'hidden' ); + }, + + render: function() { + Button.prototype.render.apply( this, arguments ); + this.selectActivate(); + return this; + } +}); + +module.exports = DeleteSelectedPermanently; + + +/***/ }), + +/***/ "FcM5": +/***/ (function(module, exports) { + +var Details = wp.media.view.Attachment.Details, + TwoColumn; + +/** + * wp.media.view.Attachment.Details.TwoColumn + * + * A similar view to media.view.Attachment.Details + * for use in the Edit Attachment modal. + * + * @memberOf wp.media.view.Attachment.Details + * + * @class + * @augments wp.media.view.Attachment.Details + * @augments wp.media.view.Attachment + * @augments wp.media.View + * @augments wp.Backbone.View + * @augments Backbone.View + */ +TwoColumn = Details.extend(/** @lends wp.media.view.Attachment.Details.TowColumn.prototype */{ + template: wp.template( 'attachment-details-two-column' ), + + initialize: function() { + this.controller.on( 'content:activate:edit-details', _.bind( this.editAttachment, this ) ); + + Details.prototype.initialize.apply( this, arguments ); + }, + + editAttachment: function( event ) { + if ( event ) { + event.preventDefault(); + } + this.controller.content.mode( 'edit-image' ); + }, + + /** + * Noop this from parent class, doesn't apply here. + */ + toggleSelectionHandler: function() {} + +}); + +module.exports = TwoColumn; /***/ }), -/* 12 */ + +/***/ "Ffsb": +/***/ (function(module, exports) { + + +var Button = wp.media.view.Button, + l10n = wp.media.view.l10n, + SelectModeToggle; + +/** + * wp.media.view.SelectModeToggleButton + * + * @memberOf wp.media.view + * + * @class + * @augments wp.media.view.Button + * @augments wp.media.View + * @augments wp.Backbone.View + * @augments Backbone.View + */ +SelectModeToggle = Button.extend(/** @lends wp.media.view.SelectModeToggle.prototype */{ + initialize: function() { + _.defaults( this.options, { + size : '' + } ); + + Button.prototype.initialize.apply( this, arguments ); + this.controller.on( 'select:activate select:deactivate', this.toggleBulkEditHandler, this ); + this.controller.on( 'selection:action:done', this.back, this ); + }, + + back: function () { + this.controller.deactivateMode( 'select' ).activateMode( 'edit' ); + }, + + click: function() { + Button.prototype.click.apply( this, arguments ); + if ( this.controller.isModeActive( 'select' ) ) { + this.back(); + } else { + this.controller.deactivateMode( 'edit' ).activateMode( 'select' ); + } + }, + + render: function() { + Button.prototype.render.apply( this, arguments ); + this.$el.addClass( 'select-mode-toggle-button' ); + return this; + }, + + toggleBulkEditHandler: function() { + var toolbar = this.controller.content.get().toolbar, children; + + children = toolbar.$( '.media-toolbar-secondary > *, .media-toolbar-primary > *' ); + + // @todo The Frame should be doing all of this. + if ( this.controller.isModeActive( 'select' ) ) { + this.model.set( { + size: 'large', + text: l10n.cancel + } ); + children.not( '.spinner, .media-button' ).hide(); + this.$el.show(); + toolbar.$el.addClass( 'media-toolbar-mode-select' ); + toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' ); + } else { + this.model.set( { + size: '', + text: l10n.bulkSelect + } ); + this.controller.content.get().$el.removeClass( 'fixed' ); + toolbar.$el.css( 'width', '' ); + toolbar.$el.removeClass( 'media-toolbar-mode-select' ); + toolbar.$( '.delete-selected-button' ).addClass( 'hidden' ); + children.not( '.media-button' ).show(); + this.controller.state().get( 'selection' ).reset(); + } + } +}); + +module.exports = SelectModeToggle; + + +/***/ }), + +/***/ "HUrf": +/***/ (function(module, exports) { + +var View = wp.media.View, + EditImage = wp.media.view.EditImage, + Details; + +/** + * wp.media.view.EditImage.Details + * + * @memberOf wp.media.view.EditImage + * + * @class + * @augments wp.media.view.EditImage + * @augments wp.media.View + * @augments wp.Backbone.View + * @augments Backbone.View + */ +Details = EditImage.extend(/** @lends wp.media.view.EditImage.Details.prototype */{ + initialize: function( options ) { + this.editor = window.imageEdit; + this.frame = options.frame; + this.controller = options.controller; + View.prototype.initialize.apply( this, arguments ); + }, + + back: function() { + this.frame.content.mode( 'edit-metadata' ); + }, + + save: function() { + this.model.fetch().done( _.bind( function() { + this.frame.content.mode( 'edit-metadata' ); + }, this ) ); + } +}); + +module.exports = Details; + + +/***/ }), + +/***/ "LRQ5": /***/ (function(module, exports, __webpack_require__) { /** @@ -112,19 +332,94 @@ var media = wp.media; -media.controller.EditAttachmentMetadata = __webpack_require__( 13 ); -media.view.MediaFrame.Manage = __webpack_require__( 14 ); -media.view.Attachment.Details.TwoColumn = __webpack_require__( 15 ); -media.view.MediaFrame.Manage.Router = __webpack_require__( 16 ); -media.view.EditImage.Details = __webpack_require__( 17 ); -media.view.MediaFrame.EditAttachments = __webpack_require__( 18 ); -media.view.SelectModeToggleButton = __webpack_require__( 19 ); -media.view.DeleteSelectedButton = __webpack_require__( 20 ); -media.view.DeleteSelectedPermanentlyButton = __webpack_require__( 21 ); +media.controller.EditAttachmentMetadata = __webpack_require__( "ZJBI" ); +media.view.MediaFrame.Manage = __webpack_require__( "lH8y" ); +media.view.Attachment.Details.TwoColumn = __webpack_require__( "FcM5" ); +media.view.MediaFrame.Manage.Router = __webpack_require__( "OMfl" ); +media.view.EditImage.Details = __webpack_require__( "HUrf" ); +media.view.MediaFrame.EditAttachments = __webpack_require__( "wQX5" ); +media.view.SelectModeToggleButton = __webpack_require__( "Ffsb" ); +media.view.DeleteSelectedButton = __webpack_require__( "nD7t" ); +media.view.DeleteSelectedPermanentlyButton = __webpack_require__( "1lLZ" ); /***/ }), -/* 13 */ + +/***/ "OMfl": +/***/ (function(module, exports) { + +/** + * wp.media.view.MediaFrame.Manage.Router + * + * A router for handling the browser history and application state. + * + * @memberOf wp.media.view.MediaFrame.Manage + * + * @class + * @augments Backbone.Router + */ +var Router = Backbone.Router.extend(/** @lends wp.media.view.MediaFrame.Manage.Router.prototype */{ + routes: { + 'upload.php?item=:slug&mode=edit': 'editItem', + 'upload.php?item=:slug': 'showItem', + 'upload.php?search=:query': 'search', + 'upload.php': 'reset' + }, + + // Map routes against the page URL. + baseUrl: function( url ) { + return 'upload.php' + url; + }, + + reset: function() { + var frame = wp.media.frames.edit; + + if ( frame ) { + frame.close(); + } + }, + + // Respond to the search route by filling the search field and triggering the input event. + search: function( query ) { + jQuery( '#media-search-input' ).val( query ).trigger( 'input' ); + }, + + // Show the modal with a specific item. + showItem: function( query ) { + var media = wp.media, + frame = media.frames.browse, + library = frame.state().get('library'), + item; + + // Trigger the media frame to open the correct item. + item = library.findWhere( { id: parseInt( query, 10 ) } ); + + if ( item ) { + item.set( 'skipHistory', true ); + frame.trigger( 'edit:attachment', item ); + } else { + item = media.attachment( query ); + frame.listenTo( item, 'change', function( model ) { + frame.stopListening( item ); + frame.trigger( 'edit:attachment', model ); + } ); + item.fetch(); + } + }, + + // Show the modal in edit mode with a specific item. + editItem: function( query ) { + this.showItem( query ); + wp.media.frames.edit.content.mode( 'edit-details' ); + } +}); + +module.exports = Router; + + +/***/ }), + +/***/ "ZJBI": /***/ (function(module, exports) { var l10n = wp.media.view.l10n, @@ -158,7 +453,8 @@ /***/ }), -/* 14 */ + +/***/ "lH8y": /***/ (function(module, exports) { var MediaFrame = wp.media.view.MediaFrame, @@ -451,178 +747,69 @@ /***/ }), -/* 15 */ + +/***/ "nD7t": /***/ (function(module, exports) { -var Details = wp.media.view.Attachment.Details, - TwoColumn; +var Button = wp.media.view.Button, + l10n = wp.media.view.l10n, + DeleteSelected; /** - * wp.media.view.Attachment.Details.TwoColumn + * wp.media.view.DeleteSelectedButton * - * A similar view to media.view.Attachment.Details - * for use in the Edit Attachment modal. + * A button that handles bulk Delete/Trash logic * - * @memberOf wp.media.view.Attachment.Details + * @memberOf wp.media.view * * @class - * @augments wp.media.view.Attachment.Details - * @augments wp.media.view.Attachment + * @augments wp.media.view.Button * @augments wp.media.View * @augments wp.Backbone.View * @augments Backbone.View */ -TwoColumn = Details.extend(/** @lends wp.media.view.Attachment.Details.TowColumn.prototype */{ - template: wp.template( 'attachment-details-two-column' ), - +DeleteSelected = Button.extend(/** @lends wp.media.view.DeleteSelectedButton.prototype */{ initialize: function() { - this.controller.on( 'content:activate:edit-details', _.bind( this.editAttachment, this ) ); - - Details.prototype.initialize.apply( this, arguments ); - }, - - editAttachment: function( event ) { - if ( event ) { - event.preventDefault(); + Button.prototype.initialize.apply( this, arguments ); + if ( this.options.filters ) { + this.options.filters.model.on( 'change', this.filterChange, this ); } - this.controller.content.mode( 'edit-image' ); + this.controller.on( 'selection:toggle', this.toggleDisabled, this ); + this.controller.on( 'select:activate', this.toggleDisabled, this ); }, - /** - * Noop this from parent class, doesn't apply here. - */ - toggleSelectionHandler: function() {}, - - render: function() { - Details.prototype.render.apply( this, arguments ); - - wp.media.mixin.removeAllPlayers(); - this.$( 'audio, video' ).each( function (i, elem) { - var el = wp.media.view.MediaDetails.prepareSrc( elem ); - new window.MediaElementPlayer( el, wp.media.mixin.mejsSettings ); - } ); - } -}); - -module.exports = TwoColumn; - - -/***/ }), -/* 16 */ -/***/ (function(module, exports) { - -/** - * wp.media.view.MediaFrame.Manage.Router - * - * A router for handling the browser history and application state. - * - * @memberOf wp.media.view.MediaFrame.Manage - * - * @class - * @augments Backbone.Router - */ -var Router = Backbone.Router.extend(/** @lends wp.media.view.MediaFrame.Manage.Router.prototype */{ - routes: { - 'upload.php?item=:slug&mode=edit': 'editItem', - 'upload.php?item=:slug': 'showItem', - 'upload.php?search=:query': 'search', - 'upload.php': 'reset' - }, - - // Map routes against the page URL. - baseUrl: function( url ) { - return 'upload.php' + url; - }, - - reset: function() { - var frame = wp.media.frames.edit; - - if ( frame ) { - frame.close(); + filterChange: function( model ) { + if ( 'trash' === model.get( 'status' ) ) { + this.model.set( 'text', l10n.restoreSelected ); + } else if ( wp.media.view.settings.mediaTrash ) { + this.model.set( 'text', l10n.trashSelected ); + } else { + this.model.set( 'text', l10n.deletePermanently ); } }, - // Respond to the search route by filling the search field and trigggering the input event. - search: function( query ) { - jQuery( '#media-search-input' ).val( query ).trigger( 'input' ); + toggleDisabled: function() { + this.model.set( 'disabled', ! this.controller.state().get( 'selection' ).length ); }, - // Show the modal with a specific item. - showItem: function( query ) { - var media = wp.media, - frame = media.frames.browse, - library = frame.state().get('library'), - item; - - // Trigger the media frame to open the correct item. - item = library.findWhere( { id: parseInt( query, 10 ) } ); - item.set( 'skipHistory', true ); - - if ( item ) { - frame.trigger( 'edit:attachment', item ); + render: function() { + Button.prototype.render.apply( this, arguments ); + if ( this.controller.isModeActive( 'select' ) ) { + this.$el.addClass( 'delete-selected-button' ); } else { - item = media.attachment( query ); - frame.listenTo( item, 'change', function( model ) { - frame.stopListening( item ); - frame.trigger( 'edit:attachment', model ); - } ); - item.fetch(); + this.$el.addClass( 'delete-selected-button hidden' ); } - }, - - // Show the modal in edit mode with a specific item. - editItem: function( query ) { - this.showItem( query ); - wp.media.frames.edit.content.mode( 'edit-details' ); + this.toggleDisabled(); + return this; } }); -module.exports = Router; +module.exports = DeleteSelected; /***/ }), -/* 17 */ -/***/ (function(module, exports) { -var View = wp.media.View, - EditImage = wp.media.view.EditImage, - Details; - -/** - * wp.media.view.EditImage.Details - * - * @memberOf wp.media.view.EditImage - * - * @class - * @augments wp.media.view.EditImage - * @augments wp.media.View - * @augments wp.Backbone.View - * @augments Backbone.View - */ -Details = EditImage.extend(/** @lends wp.media.view.EditImage.Details.prototype */{ - initialize: function( options ) { - this.editor = window.imageEdit; - this.frame = options.frame; - this.controller = options.controller; - View.prototype.initialize.apply( this, arguments ); - }, - - back: function() { - this.frame.content.mode( 'edit-metadata' ); - }, - - save: function() { - this.model.fetch().done( _.bind( function() { - this.frame.content.mode( 'edit-metadata' ); - }, this ) ); - } -}); - -module.exports = Details; - - -/***/ }), -/* 18 */ +/***/ "wQX5": /***/ (function(module, exports) { var Frame = wp.media.view.Frame, @@ -721,7 +908,7 @@ // Remove the keydown event. $( 'body' ).off( 'keydown.media-modal' ); // Move focus back to the original item in the grid if possible. - $( 'li.attachment[data-id="' + this.model.get( 'id' ) +'"]' ).focus(); + $( 'li.attachment[data-id="' + this.model.get( 'id' ) +'"]' ).trigger( 'focus' ); this.resetRoute(); }, this ) ); @@ -859,7 +1046,7 @@ * @param {string} which A CSS selector to target the button to focus. */ focusNavButton: function( which ) { - $( which ).focus(); + $( which ).trigger( 'focus' ); }, getCurrentIndex: function() { @@ -902,201 +1089,6 @@ module.exports = EditAttachments; -/***/ }), -/* 19 */ -/***/ (function(module, exports) { - - -var Button = wp.media.view.Button, - l10n = wp.media.view.l10n, - SelectModeToggle; - -/** - * wp.media.view.SelectModeToggleButton - * - * @memberOf wp.media.view - * - * @class - * @augments wp.media.view.Button - * @augments wp.media.View - * @augments wp.Backbone.View - * @augments Backbone.View - */ -SelectModeToggle = Button.extend(/** @lends wp.media.view.SelectModeToggle.prototype */{ - initialize: function() { - _.defaults( this.options, { - size : '' - } ); - - Button.prototype.initialize.apply( this, arguments ); - this.controller.on( 'select:activate select:deactivate', this.toggleBulkEditHandler, this ); - this.controller.on( 'selection:action:done', this.back, this ); - }, - - back: function () { - this.controller.deactivateMode( 'select' ).activateMode( 'edit' ); - }, - - click: function() { - Button.prototype.click.apply( this, arguments ); - if ( this.controller.isModeActive( 'select' ) ) { - this.back(); - } else { - this.controller.deactivateMode( 'edit' ).activateMode( 'select' ); - } - }, - - render: function() { - Button.prototype.render.apply( this, arguments ); - this.$el.addClass( 'select-mode-toggle-button' ); - return this; - }, - - toggleBulkEditHandler: function() { - var toolbar = this.controller.content.get().toolbar, children; - - children = toolbar.$( '.media-toolbar-secondary > *, .media-toolbar-primary > *' ); - - // @todo The Frame should be doing all of this. - if ( this.controller.isModeActive( 'select' ) ) { - this.model.set( { - size: 'large', - text: l10n.cancel - } ); - children.not( '.spinner, .media-button' ).hide(); - this.$el.show(); - toolbar.$el.addClass( 'media-toolbar-mode-select' ); - toolbar.$( '.delete-selected-button' ).removeClass( 'hidden' ); - } else { - this.model.set( { - size: '', - text: l10n.bulkSelect - } ); - this.controller.content.get().$el.removeClass( 'fixed' ); - toolbar.$el.css( 'width', '' ); - toolbar.$el.removeClass( 'media-toolbar-mode-select' ); - toolbar.$( '.delete-selected-button' ).addClass( 'hidden' ); - children.not( '.media-button' ).show(); - this.controller.state().get( 'selection' ).reset(); - } - } -}); - -module.exports = SelectModeToggle; - - -/***/ }), -/* 20 */ -/***/ (function(module, exports) { - -var Button = wp.media.view.Button, - l10n = wp.media.view.l10n, - DeleteSelected; +/***/ }) -/** - * wp.media.view.DeleteSelectedButton - * - * A button that handles bulk Delete/Trash logic - * - * @memberOf wp.media.view - * - * @class - * @augments wp.media.view.Button - * @augments wp.media.View - * @augments wp.Backbone.View - * @augments Backbone.View - */ -DeleteSelected = Button.extend(/** @lends wp.media.view.DeleteSelectedButton.prototype */{ - initialize: function() { - Button.prototype.initialize.apply( this, arguments ); - if ( this.options.filters ) { - this.options.filters.model.on( 'change', this.filterChange, this ); - } - this.controller.on( 'selection:toggle', this.toggleDisabled, this ); - this.controller.on( 'select:activate', this.toggleDisabled, this ); - }, - - filterChange: function( model ) { - if ( 'trash' === model.get( 'status' ) ) { - this.model.set( 'text', l10n.restoreSelected ); - } else if ( wp.media.view.settings.mediaTrash ) { - this.model.set( 'text', l10n.trashSelected ); - } else { - this.model.set( 'text', l10n.deletePermanently ); - } - }, - - toggleDisabled: function() { - this.model.set( 'disabled', ! this.controller.state().get( 'selection' ).length ); - }, - - render: function() { - Button.prototype.render.apply( this, arguments ); - if ( this.controller.isModeActive( 'select' ) ) { - this.$el.addClass( 'delete-selected-button' ); - } else { - this.$el.addClass( 'delete-selected-button hidden' ); - } - this.toggleDisabled(); - return this; - } -}); - -module.exports = DeleteSelected; - - -/***/ }), -/* 21 */ -/***/ (function(module, exports) { - -var Button = wp.media.view.Button, - DeleteSelected = wp.media.view.DeleteSelectedButton, - DeleteSelectedPermanently; - -/** - * wp.media.view.DeleteSelectedPermanentlyButton - * - * When MEDIA_TRASH is true, a button that handles bulk Delete Permanently logic - * - * @memberOf wp.media.view - * - * @class - * @augments wp.media.view.DeleteSelectedButton - * @augments wp.media.view.Button - * @augments wp.media.View - * @augments wp.Backbone.View - * @augments Backbone.View - */ -DeleteSelectedPermanently = DeleteSelected.extend(/** @lends wp.media.view.DeleteSelectedPermanentlyButton.prototype */{ - initialize: function() { - DeleteSelected.prototype.initialize.apply( this, arguments ); - this.controller.on( 'select:activate', this.selectActivate, this ); - this.controller.on( 'select:deactivate', this.selectDeactivate, this ); - }, - - filterChange: function( model ) { - this.canShow = ( 'trash' === model.get( 'status' ) ); - }, - - selectActivate: function() { - this.toggleDisabled(); - this.$el.toggleClass( 'hidden', ! this.canShow ); - }, - - selectDeactivate: function() { - this.toggleDisabled(); - this.$el.addClass( 'hidden' ); - }, - - render: function() { - Button.prototype.render.apply( this, arguments ); - this.selectActivate(); - return this; - } -}); - -module.exports = DeleteSelectedPermanently; - - -/***/ }) -/******/ ]); \ No newline at end of file +/******/ }); \ No newline at end of file