From 634f3cdae0015c24983bb61d7cf8f33cb078c17a Mon Sep 17 00:00:00 2001 From: Konstantin Obenland Date: Tue, 2 May 2017 15:14:09 -0700 Subject: [PATCH 01/39] [WIP] Gallery Widget First pass. Fixes #62. --- core-media-widgets.php | 3 + wp-admin/js/widgets/media-gallery-widget.js | 154 ++++++++++++++++ .../widgets/class-wp-widget-media-gallery.php | 166 ++++++++++++++++++ 3 files changed, 323 insertions(+) create mode 100644 wp-admin/js/widgets/media-gallery-widget.js create mode 100644 wp-includes/widgets/class-wp-widget-media-gallery.php diff --git a/core-media-widgets.php b/core-media-widgets.php index 6581b18..38f62b0 100644 --- a/core-media-widgets.php +++ b/core-media-widgets.php @@ -41,6 +41,7 @@ function wp32417_default_scripts( WP_Scripts $scripts ) { $scripts->add_inline_script( 'media-widgets', 'wp.mediaWidgets.init();', 'after' ); $scripts->add( 'media-audio-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-audio-widget.js', array( 'media-widgets', 'media-audiovideo' ) ); + $scripts->add( 'media-gallery-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-gallery-widget.js', array( 'media-widgets' ) ); $scripts->add( 'media-image-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-image-widget.js', array( 'media-widgets' ) ); $scripts->add( 'media-video-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-video-widget.js', array( 'media-widgets', 'media-audiovideo' ) ); @@ -88,9 +89,11 @@ function wp32417_twentyten_styles() { function wp32417_widgets_init() { require_once( dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media.php' ); require_once( dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-audio.php' ); + require_once( dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-gallery.php' ); require_once( dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-image.php' ); require_once( dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-video.php' ); + register_widget( 'WP_Widget_Media_Gallery' ); register_widget( 'WP_Widget_Media_Image' ); register_widget( 'WP_Widget_Media_Video' ); register_widget( 'WP_Widget_Media_Audio' ); diff --git a/wp-admin/js/widgets/media-gallery-widget.js b/wp-admin/js/widgets/media-gallery-widget.js new file mode 100644 index 0000000..2a4aeeb --- /dev/null +++ b/wp-admin/js/widgets/media-gallery-widget.js @@ -0,0 +1,154 @@ +/* eslint consistent-this: [ "error", "control" ] */ +(function( component ) { + 'use strict'; + + var GalleryWidgetModel, GalleryWidgetControl, GalleryDetailsMediaFrame; + + /** + * Custom gallery details frame. + * + * @class GalleryDetailsMediaFrame + * @constructor + */ + GalleryDetailsMediaFrame = wp.media.view.MediaFrame.Post.extend( { + + /** + * Create the default states. + * + * @returns {void} + */ + createStates: function createStates() { + this.states.add([ + new wp.media.controller.Library({ + id: 'gallery', + title: wp.media.view.l10n.createGalleryTitle, + priority: 40, + toolbar: 'main-gallery', + filterable: 'uploaded', + multiple: 'add', + editable: false, + + library: wp.media.query( _.defaults({ + type: 'image' + }, this.options.library ) ) + }), + + // Gallery states. + new wp.media.controller.GalleryEdit({ + library: this.options.selection, + editing: this.options.editing, + menu: 'gallery' + }), + + new wp.media.controller.GalleryAdd() + ]); + } + } ); + + /** + * Gallery widget model. + * + * See WP_Widget_Gallery::enqueue_admin_scripts() for amending prototype from PHP exports. + * + * @class GalleryWidgetModel + * @constructor + */ + GalleryWidgetModel = component.MediaWidgetModel.extend( {} ); + + /** + * Gallery widget control. + * + * See WP_Widget_Gallery::enqueue_admin_scripts() for amending prototype from PHP exports. + * + * @class GalleryWidgetControl + * @constructor + */ + GalleryWidgetControl = component.MediaWidgetControl.extend( { + + + /** + * Render preview. + * + * @returns {void} + */ + renderPreview: function renderPreview() { + var control = this, previewContainer, previewTemplate; + previewContainer = control.$el.find( '.media-widget-preview' ); + previewTemplate = wp.template( 'wp-media-widget-gallery-preview' ); + previewContainer.html( previewTemplate( _.extend( control.previewTemplateProps.toJSON() ) ) ); + }, + + /** + * Open the media select frame to chose an item. + * + * @returns {void} + */ + selectMedia: function selectMedia() { + var control = this, selection, mediaFrame, defaultSync, mediaFrameProps; + + if ( control.isSelected() && 0 !== control.model.get( 'attachment_id' ) ) { + selection = new wp.media.model.Selection( [ control.selectedAttachment ] ); + } else { + selection = null; + } + + mediaFrameProps = control.mapModelToMediaFrameProps( control.model.toJSON() ); + if ( mediaFrameProps.size ) { + control.displaySettings.set( 'size', mediaFrameProps.size ); + } + + mediaFrame = new GalleryDetailsMediaFrame({ + frame: 'select', + text: control.l10n.add_to_widget, + selection: selection, + mimeType: control.mime_type, + selectedDisplaySettings: control.displaySettings, + showDisplaySettings: control.showDisplaySettings, + metadata: mediaFrameProps, + state: 'gallery' + }); + wp.media.frame = mediaFrame; // See wp.media(). + + // Handle selection of a media item. + mediaFrame.on( 'reset', function onInsert() { + var state = mediaFrame.state(); +console.log(wp.media.controller.state().get('selection')); + }); + + // Disable syncing of attachment changes back to server. See . + defaultSync = wp.media.model.Attachment.prototype.sync; + wp.media.model.Attachment.prototype.sync = function rejectedSync() { + return $.Deferred().rejectWith( this ).promise(); + }; + mediaFrame.on( 'close', function onClose() { + wp.media.model.Attachment.prototype.sync = defaultSync; + }); + + mediaFrame.$el.addClass( 'media-widget' ); + mediaFrame.open(); + + // Clear the selected attachment when it is deleted in the media select frame. + if ( selection ) { + selection.on( 'destroy', function onDestroy( attachment ) { + if ( control.model.get( 'attachment_id' ) === attachment.get( 'id' ) ) { + control.model.set({ + attachment_id: 0, + url: '' + }); + } + }); + } + + /* + * Make sure focus is set inside of modal so that hitting Esc will close + * the modal and not inadvertently cause the widget to collapse in the customizer. + */ + mediaFrame.$el.find( ':focusable:first' ).focus(); + } + } ); + + // Exports. + component.controlConstructors.media_gallery = GalleryWidgetControl; + component.modelConstructors.media_gallery = GalleryWidgetModel; + +})( wp.mediaWidgets ); diff --git a/wp-includes/widgets/class-wp-widget-media-gallery.php b/wp-includes/widgets/class-wp-widget-media-gallery.php new file mode 100644 index 0000000..ad2ad18 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-media-gallery.php @@ -0,0 +1,166 @@ + __( 'Displays an image gallery.' ), + 'mime_type' => 'image', + ) ); + + $this->l10n = array_merge( $this->l10n, array( + 'no_media_selected' => __( 'No images selected' ), + 'select_media' => _x( 'Select Images', 'label for button in the gallery widget; should not be longer than ~13 characters long' ), + 'change_media' => _x( 'Add Image', 'label for button in the gallery widget; should not be longer than ~13 characters long' ), + 'edit_media' => _x( 'Edit Gallery', 'label for button in the gallery widget; should not be longer than ~13 characters long' ), + 'missing_attachment' => sprintf( + /* translators: placeholder is URL to media library */ + __( 'We can’t find that gallery. Check your media library and make sure it wasn’t deleted.' ), + esc_url( admin_url( 'upload.php' ) ) + ), + 'media_library_state_multi' => '', + 'media_library_state_single' => '', + ) ); + } + + /** + * Get schema for properties of a widget instance (item). + * + * @since 4.8.0 + * @access public + * + * @see WP_REST_Controller::get_item_schema() + * @see WP_REST_Controller::get_additional_fields() + * @link https://core.trac.wordpress.org/ticket/35574 + * @return array Schema for properties. + */ + public function get_instance_schema() { + return array_merge( + parent::get_instance_schema(), + array( + 'ids' => array( + 'type' => 'array', + 'default' => array(), + ), + 'columns' => array( + 'type' => 'integer', + 'default' => 3, + ), + 'size' => array( + 'type' => 'string', + 'enum' => array_merge( get_intermediate_image_sizes(), array( 'full', 'custom' ) ), + 'default' => 'thumbnail', + ), + 'link' => array( + 'type' => 'string', + 'default' => '', + 'format' => 'uri', + 'sanitize_callback' => 'esc_url', + 'should_preview_update' => false, + ), + ) + ); + } + + /** + * Render the media on the frontend. + * + * @since 4.8.0 + * @access public + * + * @param array $instance Widget instance props. + * @return void + */ + public function render_media( $instance ) { + $instance = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance ); + + echo gallery_shortcode( array( + 'ids' => $instance['ids'], + ) ); + } + + /** + * Loads the required media files for the media manager and scripts for media widgets. + * + * @since 4.8.0 + * @access public + */ + public function enqueue_admin_scripts() { + parent::enqueue_admin_scripts(); + + $handle = 'media-gallery-widget'; + wp_enqueue_script( $handle ); + + $exported_schema = array(); + foreach ( $this->get_instance_schema() as $field => $field_schema ) { + $exported_schema[ $field ] = wp_array_slice_assoc( $field_schema, array( 'type', 'default', 'enum', 'minimum', 'format', 'media_prop', 'should_preview_update' ) ); + } + wp_add_inline_script( + $handle, + sprintf( + 'wp.mediaWidgets.modelConstructors[ %s ].prototype.schema = %s;', + wp_json_encode( $this->id_base ), + wp_json_encode( $exported_schema ) + ) + ); + + wp_add_inline_script( + $handle, + sprintf( + ' + wp.mediaWidgets.controlConstructors[ %1$s ].prototype.mime_type = %2$s; + _.extend( wp.mediaWidgets.controlConstructors[ %1$s ].prototype.l10n, %3$s ); + ', + wp_json_encode( $this->id_base ), + wp_json_encode( $this->widget_options['mime_type'] ), + wp_json_encode( $this->l10n ) + ) + ); + } + + /** + * Render form template scripts. + * + * @since 4.8.0 + * @access public + */ + public function render_control_template_scripts() { + parent::render_control_template_scripts(); + + ?> + + Date: Wed, 3 May 2017 11:20:02 -0700 Subject: [PATCH 02/39] Add preview for galleries Very basic, needs much more polish. And styles. --- wp-admin/js/widgets/media-gallery-widget.js | 18 +++++- .../widgets/class-wp-widget-media-gallery.php | 55 ++++++++++++++++--- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/wp-admin/js/widgets/media-gallery-widget.js b/wp-admin/js/widgets/media-gallery-widget.js index 2a4aeeb..f0dbbea 100644 --- a/wp-admin/js/widgets/media-gallery-widget.js +++ b/wp-admin/js/widgets/media-gallery-widget.js @@ -109,11 +109,23 @@ }); wp.media.frame = mediaFrame; // See wp.media(). + // Handle selection of a media item. - mediaFrame.on( 'reset', function onInsert() { + mediaFrame.on( 'update', function onUpdate( selection ) { var state = mediaFrame.state(); -console.log(wp.media.controller.state().get('selection')); - }); + + selection = selection || state.get( 'selection' ); + + if ( ! selection ) { + return; + } + + // Update widget instance. + control.model.set( { + ids: _.pluck( selection.models, 'id' ).join( ',' ), + attachments: selection.models.map( function( model ) { return model.toJSON(); } ) + } ); + } ); // Disable syncing of attachment changes back to server. See . defaultSync = wp.media.model.Attachment.prototype.sync; diff --git a/wp-includes/widgets/class-wp-widget-media-gallery.php b/wp-includes/widgets/class-wp-widget-media-gallery.php index ad2ad18..2872e11 100644 --- a/wp-includes/widgets/class-wp-widget-media-gallery.php +++ b/wp-includes/widgets/class-wp-widget-media-gallery.php @@ -59,8 +59,8 @@ public function get_instance_schema() { parent::get_instance_schema(), array( 'ids' => array( - 'type' => 'array', - 'default' => array(), + 'type' => 'string', + 'default' => '', ), 'columns' => array( 'type' => 'integer', @@ -71,13 +71,23 @@ public function get_instance_schema() { 'enum' => array_merge( get_intermediate_image_sizes(), array( 'full', 'custom' ) ), 'default' => 'thumbnail', ), - 'link' => array( + 'link_type' => array( 'type' => 'string', - 'default' => '', - 'format' => 'uri', - 'sanitize_callback' => 'esc_url', + 'enum' => array( 'none', 'file', 'post' ), + 'default' => 'none', + 'media_prop' => 'link', 'should_preview_update' => false, ), + 'orderby_random' => array( + 'type' => 'boolean', + 'default' => false, + 'media_prop' => '_orderbyRandom', + 'should_preview_update' => false, + ), + 'attachments' => array( + 'type' => 'array', + 'default' => array(), + ), ) ); } @@ -93,10 +103,15 @@ public function get_instance_schema() { */ public function render_media( $instance ) { $instance = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance ); - - echo gallery_shortcode( array( + $shortcode_atts = array( 'ids' => $instance['ids'], - ) ); + ); + + if ( $instance['orderby_random'] ) { + $shortcode_atts['orderby'] = 'rand'; + } + + echo gallery_shortcode( $shortcode_atts ); } /** @@ -155,6 +170,28 @@ public function render_control_template_scripts() {

l10n['missing_attachment']; ?>

+ <# } else if ( data.attachments.length ) { #> +
+ <# _.each( data.attachments, function( attachment, index ) { #> +
+
+ <# if ( attachment.sizes.thumbnail ) { #> + + <# } else { #> + + <# } #> +
+ <# if ( attachment.caption ) { #> +
+ {{{ data.verifyHTML( attachment.caption ) }}} +
+ <# } #> +
+ <# if ( index % data.columns === data.columns - 1 ) { #> +
+ <# } #> + <# } ); #> +
<# } else { #>

l10n['no_media_selected'] ); ?>

From 905edbccfc2a623b73a93dac803c5335519d7837 Mon Sep 17 00:00:00 2001 From: Timmy Crawford Date: Wed, 3 May 2017 13:59:25 -0700 Subject: [PATCH 03/39] Fix travis issues, prevent JS error. --- wp-admin/js/widgets/media-gallery-widget.js | 23 +++++++++---------- .../widgets/class-wp-widget-media-gallery.php | 6 +++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/wp-admin/js/widgets/media-gallery-widget.js b/wp-admin/js/widgets/media-gallery-widget.js index f0dbbea..843b0c2 100644 --- a/wp-admin/js/widgets/media-gallery-widget.js +++ b/wp-admin/js/widgets/media-gallery-widget.js @@ -1,5 +1,5 @@ /* eslint consistent-this: [ "error", "control" ] */ -(function( component ) { +(function( component, $ ) { 'use strict'; var GalleryWidgetModel, GalleryWidgetControl, GalleryDetailsMediaFrame; @@ -64,8 +64,6 @@ * @constructor */ GalleryWidgetControl = component.MediaWidgetControl.extend( { - - /** * Render preview. * @@ -75,7 +73,7 @@ var control = this, previewContainer, previewTemplate; previewContainer = control.$el.find( '.media-widget-preview' ); previewTemplate = wp.template( 'wp-media-widget-gallery-preview' ); - previewContainer.html( previewTemplate( _.extend( control.previewTemplateProps.toJSON() ) ) ); + previewContainer.html( previewTemplate( control.previewTemplateProps.toJSON() ) ); }, /** @@ -109,21 +107,22 @@ }); wp.media.frame = mediaFrame; // See wp.media(). - // Handle selection of a media item. - mediaFrame.on( 'update', function onUpdate( selection ) { - var state = mediaFrame.state(); + mediaFrame.on( 'update', function onUpdate( selections ) { + var state = mediaFrame.state(), selectedImages; - selection = selection || state.get( 'selection' ); + selectedImages = selections || state.get( 'selection' ); - if ( ! selection ) { + if ( ! selectedImages ) { return; } // Update widget instance. control.model.set( { - ids: _.pluck( selection.models, 'id' ).join( ',' ), - attachments: selection.models.map( function( model ) { return model.toJSON(); } ) + ids: _.pluck( selectedImages.models, 'id' ).join( ',' ), + attachments: selectedImages.models.map( function( model ) { + return model.toJSON(); + } ) } ); } ); @@ -163,4 +162,4 @@ component.controlConstructors.media_gallery = GalleryWidgetControl; component.modelConstructors.media_gallery = GalleryWidgetModel; -})( wp.mediaWidgets ); +})( wp.mediaWidgets, jQuery ); diff --git a/wp-includes/widgets/class-wp-widget-media-gallery.php b/wp-includes/widgets/class-wp-widget-media-gallery.php index 2872e11..b2b191c 100644 --- a/wp-includes/widgets/class-wp-widget-media-gallery.php +++ b/wp-includes/widgets/class-wp-widget-media-gallery.php @@ -34,7 +34,7 @@ public function __construct() { 'change_media' => _x( 'Add Image', 'label for button in the gallery widget; should not be longer than ~13 characters long' ), 'edit_media' => _x( 'Edit Gallery', 'label for button in the gallery widget; should not be longer than ~13 characters long' ), 'missing_attachment' => sprintf( - /* translators: placeholder is URL to media library */ + /* translators: placeholder is URL to media library */ __( 'We can’t find that gallery. Check your media library and make sure it wasn’t deleted.' ), esc_url( admin_url( 'upload.php' ) ) ), @@ -107,9 +107,11 @@ public function render_media( $instance ) { 'ids' => $instance['ids'], ); + // @codingStandardsIgnoreStart if ( $instance['orderby_random'] ) { $shortcode_atts['orderby'] = 'rand'; } + // @codingStandardsIgnoreEnd echo gallery_shortcode( $shortcode_atts ); } @@ -170,7 +172,7 @@ public function render_control_template_scripts() {

l10n['missing_attachment']; ?>

- <# } else if ( data.attachments.length ) { #> + <# } else if ( Array.isArray( data.attachments ) && data.attachments.length ) { #>
<# _.each( data.attachments, function( attachment, index ) { #>
From 77463cd0c2653c92b29adb2e96e2e301d7c354af Mon Sep 17 00:00:00 2001 From: Konstantin Obenland Date: Tue, 2 May 2017 15:14:09 -0700 Subject: [PATCH 04/39] [WIP] Gallery Widget First pass. Fixes #62. --- core-media-widgets.php | 9 + wp-admin/js/widgets/media-gallery-widget.js | 154 ++++++++++++++++ .../widgets/class-wp-widget-media-gallery.php | 166 ++++++++++++++++++ 3 files changed, 329 insertions(+) create mode 100644 wp-admin/js/widgets/media-gallery-widget.js create mode 100644 wp-includes/widgets/class-wp-widget-media-gallery.php diff --git a/core-media-widgets.php b/core-media-widgets.php index 105f441..7a7c31d 100644 --- a/core-media-widgets.php +++ b/core-media-widgets.php @@ -58,6 +58,7 @@ function wp32417_default_scripts( WP_Scripts $scripts ) { $scripts->add( $handle, $src, array( 'media-widgets' ) ); } +<<<<<<< 1089ca34acba917e303f4b8a72e72284d63135cb $handle = 'media-video-widget'; $src = plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-video-widget.js'; if ( ! $scripts->query( $handle, 'registered' ) ) { @@ -69,6 +70,12 @@ function wp32417_default_scripts( WP_Scripts $scripts ) { if ( ! $scripts->query( $handle, 'registered' ) ) { $scripts->add( $handle, $src, array( 'media-widgets', 'media-audiovideo' ) ); } +======= + $scripts->add( 'media-audio-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-audio-widget.js', array( 'media-widgets', 'media-audiovideo' ) ); + $scripts->add( 'media-gallery-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-gallery-widget.js', array( 'media-widgets' ) ); + $scripts->add( 'media-image-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-image-widget.js', array( 'media-widgets' ) ); + $scripts->add( 'media-video-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-video-widget.js', array( 'media-widgets', 'media-audiovideo' ) ); +>>>>>>> [WIP] Gallery Widget if ( ! WP_CORE_MEDIA_WIDGETS_MERGED ) { $scripts->add_inline_script( 'customize-selective-refresh', file_get_contents( dirname( __FILE__ ) . '/wp-includes/js/customize-selective-refresh-extras.js' ) ); @@ -133,12 +140,14 @@ function wp32417_twentyten_styles() { * @codeCoverageIgnore */ function wp32417_widgets_init() { +<<<<<<< 1089ca34acba917e303f4b8a72e72284d63135cb $class_files = array( 'WP_Widget_Media' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media.php', 'WP_Widget_Media_Image' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-image.php', 'WP_Widget_Media_Video' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-video.php', 'WP_Widget_Media_Audio' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-audio.php', + 'WP_Widget_Media_Gallery' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-gallery.php' ); ); foreach ( $class_files as $class => $file ) { if ( ! class_exists( $class ) ) { diff --git a/wp-admin/js/widgets/media-gallery-widget.js b/wp-admin/js/widgets/media-gallery-widget.js new file mode 100644 index 0000000..2a4aeeb --- /dev/null +++ b/wp-admin/js/widgets/media-gallery-widget.js @@ -0,0 +1,154 @@ +/* eslint consistent-this: [ "error", "control" ] */ +(function( component ) { + 'use strict'; + + var GalleryWidgetModel, GalleryWidgetControl, GalleryDetailsMediaFrame; + + /** + * Custom gallery details frame. + * + * @class GalleryDetailsMediaFrame + * @constructor + */ + GalleryDetailsMediaFrame = wp.media.view.MediaFrame.Post.extend( { + + /** + * Create the default states. + * + * @returns {void} + */ + createStates: function createStates() { + this.states.add([ + new wp.media.controller.Library({ + id: 'gallery', + title: wp.media.view.l10n.createGalleryTitle, + priority: 40, + toolbar: 'main-gallery', + filterable: 'uploaded', + multiple: 'add', + editable: false, + + library: wp.media.query( _.defaults({ + type: 'image' + }, this.options.library ) ) + }), + + // Gallery states. + new wp.media.controller.GalleryEdit({ + library: this.options.selection, + editing: this.options.editing, + menu: 'gallery' + }), + + new wp.media.controller.GalleryAdd() + ]); + } + } ); + + /** + * Gallery widget model. + * + * See WP_Widget_Gallery::enqueue_admin_scripts() for amending prototype from PHP exports. + * + * @class GalleryWidgetModel + * @constructor + */ + GalleryWidgetModel = component.MediaWidgetModel.extend( {} ); + + /** + * Gallery widget control. + * + * See WP_Widget_Gallery::enqueue_admin_scripts() for amending prototype from PHP exports. + * + * @class GalleryWidgetControl + * @constructor + */ + GalleryWidgetControl = component.MediaWidgetControl.extend( { + + + /** + * Render preview. + * + * @returns {void} + */ + renderPreview: function renderPreview() { + var control = this, previewContainer, previewTemplate; + previewContainer = control.$el.find( '.media-widget-preview' ); + previewTemplate = wp.template( 'wp-media-widget-gallery-preview' ); + previewContainer.html( previewTemplate( _.extend( control.previewTemplateProps.toJSON() ) ) ); + }, + + /** + * Open the media select frame to chose an item. + * + * @returns {void} + */ + selectMedia: function selectMedia() { + var control = this, selection, mediaFrame, defaultSync, mediaFrameProps; + + if ( control.isSelected() && 0 !== control.model.get( 'attachment_id' ) ) { + selection = new wp.media.model.Selection( [ control.selectedAttachment ] ); + } else { + selection = null; + } + + mediaFrameProps = control.mapModelToMediaFrameProps( control.model.toJSON() ); + if ( mediaFrameProps.size ) { + control.displaySettings.set( 'size', mediaFrameProps.size ); + } + + mediaFrame = new GalleryDetailsMediaFrame({ + frame: 'select', + text: control.l10n.add_to_widget, + selection: selection, + mimeType: control.mime_type, + selectedDisplaySettings: control.displaySettings, + showDisplaySettings: control.showDisplaySettings, + metadata: mediaFrameProps, + state: 'gallery' + }); + wp.media.frame = mediaFrame; // See wp.media(). + + // Handle selection of a media item. + mediaFrame.on( 'reset', function onInsert() { + var state = mediaFrame.state(); +console.log(wp.media.controller.state().get('selection')); + }); + + // Disable syncing of attachment changes back to server. See . + defaultSync = wp.media.model.Attachment.prototype.sync; + wp.media.model.Attachment.prototype.sync = function rejectedSync() { + return $.Deferred().rejectWith( this ).promise(); + }; + mediaFrame.on( 'close', function onClose() { + wp.media.model.Attachment.prototype.sync = defaultSync; + }); + + mediaFrame.$el.addClass( 'media-widget' ); + mediaFrame.open(); + + // Clear the selected attachment when it is deleted in the media select frame. + if ( selection ) { + selection.on( 'destroy', function onDestroy( attachment ) { + if ( control.model.get( 'attachment_id' ) === attachment.get( 'id' ) ) { + control.model.set({ + attachment_id: 0, + url: '' + }); + } + }); + } + + /* + * Make sure focus is set inside of modal so that hitting Esc will close + * the modal and not inadvertently cause the widget to collapse in the customizer. + */ + mediaFrame.$el.find( ':focusable:first' ).focus(); + } + } ); + + // Exports. + component.controlConstructors.media_gallery = GalleryWidgetControl; + component.modelConstructors.media_gallery = GalleryWidgetModel; + +})( wp.mediaWidgets ); diff --git a/wp-includes/widgets/class-wp-widget-media-gallery.php b/wp-includes/widgets/class-wp-widget-media-gallery.php new file mode 100644 index 0000000..ad2ad18 --- /dev/null +++ b/wp-includes/widgets/class-wp-widget-media-gallery.php @@ -0,0 +1,166 @@ + __( 'Displays an image gallery.' ), + 'mime_type' => 'image', + ) ); + + $this->l10n = array_merge( $this->l10n, array( + 'no_media_selected' => __( 'No images selected' ), + 'select_media' => _x( 'Select Images', 'label for button in the gallery widget; should not be longer than ~13 characters long' ), + 'change_media' => _x( 'Add Image', 'label for button in the gallery widget; should not be longer than ~13 characters long' ), + 'edit_media' => _x( 'Edit Gallery', 'label for button in the gallery widget; should not be longer than ~13 characters long' ), + 'missing_attachment' => sprintf( + /* translators: placeholder is URL to media library */ + __( 'We can’t find that gallery. Check your media library and make sure it wasn’t deleted.' ), + esc_url( admin_url( 'upload.php' ) ) + ), + 'media_library_state_multi' => '', + 'media_library_state_single' => '', + ) ); + } + + /** + * Get schema for properties of a widget instance (item). + * + * @since 4.8.0 + * @access public + * + * @see WP_REST_Controller::get_item_schema() + * @see WP_REST_Controller::get_additional_fields() + * @link https://core.trac.wordpress.org/ticket/35574 + * @return array Schema for properties. + */ + public function get_instance_schema() { + return array_merge( + parent::get_instance_schema(), + array( + 'ids' => array( + 'type' => 'array', + 'default' => array(), + ), + 'columns' => array( + 'type' => 'integer', + 'default' => 3, + ), + 'size' => array( + 'type' => 'string', + 'enum' => array_merge( get_intermediate_image_sizes(), array( 'full', 'custom' ) ), + 'default' => 'thumbnail', + ), + 'link' => array( + 'type' => 'string', + 'default' => '', + 'format' => 'uri', + 'sanitize_callback' => 'esc_url', + 'should_preview_update' => false, + ), + ) + ); + } + + /** + * Render the media on the frontend. + * + * @since 4.8.0 + * @access public + * + * @param array $instance Widget instance props. + * @return void + */ + public function render_media( $instance ) { + $instance = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance ); + + echo gallery_shortcode( array( + 'ids' => $instance['ids'], + ) ); + } + + /** + * Loads the required media files for the media manager and scripts for media widgets. + * + * @since 4.8.0 + * @access public + */ + public function enqueue_admin_scripts() { + parent::enqueue_admin_scripts(); + + $handle = 'media-gallery-widget'; + wp_enqueue_script( $handle ); + + $exported_schema = array(); + foreach ( $this->get_instance_schema() as $field => $field_schema ) { + $exported_schema[ $field ] = wp_array_slice_assoc( $field_schema, array( 'type', 'default', 'enum', 'minimum', 'format', 'media_prop', 'should_preview_update' ) ); + } + wp_add_inline_script( + $handle, + sprintf( + 'wp.mediaWidgets.modelConstructors[ %s ].prototype.schema = %s;', + wp_json_encode( $this->id_base ), + wp_json_encode( $exported_schema ) + ) + ); + + wp_add_inline_script( + $handle, + sprintf( + ' + wp.mediaWidgets.controlConstructors[ %1$s ].prototype.mime_type = %2$s; + _.extend( wp.mediaWidgets.controlConstructors[ %1$s ].prototype.l10n, %3$s ); + ', + wp_json_encode( $this->id_base ), + wp_json_encode( $this->widget_options['mime_type'] ), + wp_json_encode( $this->l10n ) + ) + ); + } + + /** + * Render form template scripts. + * + * @since 4.8.0 + * @access public + */ + public function render_control_template_scripts() { + parent::render_control_template_scripts(); + + ?> + + Date: Wed, 3 May 2017 11:20:02 -0700 Subject: [PATCH 05/39] Add preview for galleries Very basic, needs much more polish. And styles. --- wp-admin/js/widgets/media-gallery-widget.js | 18 +++++- .../widgets/class-wp-widget-media-gallery.php | 55 ++++++++++++++++--- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/wp-admin/js/widgets/media-gallery-widget.js b/wp-admin/js/widgets/media-gallery-widget.js index 2a4aeeb..f0dbbea 100644 --- a/wp-admin/js/widgets/media-gallery-widget.js +++ b/wp-admin/js/widgets/media-gallery-widget.js @@ -109,11 +109,23 @@ }); wp.media.frame = mediaFrame; // See wp.media(). + // Handle selection of a media item. - mediaFrame.on( 'reset', function onInsert() { + mediaFrame.on( 'update', function onUpdate( selection ) { var state = mediaFrame.state(); -console.log(wp.media.controller.state().get('selection')); - }); + + selection = selection || state.get( 'selection' ); + + if ( ! selection ) { + return; + } + + // Update widget instance. + control.model.set( { + ids: _.pluck( selection.models, 'id' ).join( ',' ), + attachments: selection.models.map( function( model ) { return model.toJSON(); } ) + } ); + } ); // Disable syncing of attachment changes back to server. See . defaultSync = wp.media.model.Attachment.prototype.sync; diff --git a/wp-includes/widgets/class-wp-widget-media-gallery.php b/wp-includes/widgets/class-wp-widget-media-gallery.php index ad2ad18..2872e11 100644 --- a/wp-includes/widgets/class-wp-widget-media-gallery.php +++ b/wp-includes/widgets/class-wp-widget-media-gallery.php @@ -59,8 +59,8 @@ public function get_instance_schema() { parent::get_instance_schema(), array( 'ids' => array( - 'type' => 'array', - 'default' => array(), + 'type' => 'string', + 'default' => '', ), 'columns' => array( 'type' => 'integer', @@ -71,13 +71,23 @@ public function get_instance_schema() { 'enum' => array_merge( get_intermediate_image_sizes(), array( 'full', 'custom' ) ), 'default' => 'thumbnail', ), - 'link' => array( + 'link_type' => array( 'type' => 'string', - 'default' => '', - 'format' => 'uri', - 'sanitize_callback' => 'esc_url', + 'enum' => array( 'none', 'file', 'post' ), + 'default' => 'none', + 'media_prop' => 'link', 'should_preview_update' => false, ), + 'orderby_random' => array( + 'type' => 'boolean', + 'default' => false, + 'media_prop' => '_orderbyRandom', + 'should_preview_update' => false, + ), + 'attachments' => array( + 'type' => 'array', + 'default' => array(), + ), ) ); } @@ -93,10 +103,15 @@ public function get_instance_schema() { */ public function render_media( $instance ) { $instance = array_merge( wp_list_pluck( $this->get_instance_schema(), 'default' ), $instance ); - - echo gallery_shortcode( array( + $shortcode_atts = array( 'ids' => $instance['ids'], - ) ); + ); + + if ( $instance['orderby_random'] ) { + $shortcode_atts['orderby'] = 'rand'; + } + + echo gallery_shortcode( $shortcode_atts ); } /** @@ -155,6 +170,28 @@ public function render_control_template_scripts() {

l10n['missing_attachment']; ?>

+ <# } else if ( data.attachments.length ) { #> +
+ <# _.each( data.attachments, function( attachment, index ) { #> +
+
+ <# if ( attachment.sizes.thumbnail ) { #> + + <# } else { #> + + <# } #> +
+ <# if ( attachment.caption ) { #> +
+ {{{ data.verifyHTML( attachment.caption ) }}} +
+ <# } #> +
+ <# if ( index % data.columns === data.columns - 1 ) { #> +
+ <# } #> + <# } ); #> +
<# } else { #>

l10n['no_media_selected'] ); ?>

From 75a466cc914966a686636b2572a27834185e0a21 Mon Sep 17 00:00:00 2001 From: Timmy Crawford Date: Wed, 3 May 2017 13:59:25 -0700 Subject: [PATCH 06/39] Fix travis issues, prevent JS error. --- wp-admin/js/widgets/media-gallery-widget.js | 23 +++++++++---------- .../widgets/class-wp-widget-media-gallery.php | 6 +++-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/wp-admin/js/widgets/media-gallery-widget.js b/wp-admin/js/widgets/media-gallery-widget.js index f0dbbea..843b0c2 100644 --- a/wp-admin/js/widgets/media-gallery-widget.js +++ b/wp-admin/js/widgets/media-gallery-widget.js @@ -1,5 +1,5 @@ /* eslint consistent-this: [ "error", "control" ] */ -(function( component ) { +(function( component, $ ) { 'use strict'; var GalleryWidgetModel, GalleryWidgetControl, GalleryDetailsMediaFrame; @@ -64,8 +64,6 @@ * @constructor */ GalleryWidgetControl = component.MediaWidgetControl.extend( { - - /** * Render preview. * @@ -75,7 +73,7 @@ var control = this, previewContainer, previewTemplate; previewContainer = control.$el.find( '.media-widget-preview' ); previewTemplate = wp.template( 'wp-media-widget-gallery-preview' ); - previewContainer.html( previewTemplate( _.extend( control.previewTemplateProps.toJSON() ) ) ); + previewContainer.html( previewTemplate( control.previewTemplateProps.toJSON() ) ); }, /** @@ -109,21 +107,22 @@ }); wp.media.frame = mediaFrame; // See wp.media(). - // Handle selection of a media item. - mediaFrame.on( 'update', function onUpdate( selection ) { - var state = mediaFrame.state(); + mediaFrame.on( 'update', function onUpdate( selections ) { + var state = mediaFrame.state(), selectedImages; - selection = selection || state.get( 'selection' ); + selectedImages = selections || state.get( 'selection' ); - if ( ! selection ) { + if ( ! selectedImages ) { return; } // Update widget instance. control.model.set( { - ids: _.pluck( selection.models, 'id' ).join( ',' ), - attachments: selection.models.map( function( model ) { return model.toJSON(); } ) + ids: _.pluck( selectedImages.models, 'id' ).join( ',' ), + attachments: selectedImages.models.map( function( model ) { + return model.toJSON(); + } ) } ); } ); @@ -163,4 +162,4 @@ component.controlConstructors.media_gallery = GalleryWidgetControl; component.modelConstructors.media_gallery = GalleryWidgetModel; -})( wp.mediaWidgets ); +})( wp.mediaWidgets, jQuery ); diff --git a/wp-includes/widgets/class-wp-widget-media-gallery.php b/wp-includes/widgets/class-wp-widget-media-gallery.php index 2872e11..b2b191c 100644 --- a/wp-includes/widgets/class-wp-widget-media-gallery.php +++ b/wp-includes/widgets/class-wp-widget-media-gallery.php @@ -34,7 +34,7 @@ public function __construct() { 'change_media' => _x( 'Add Image', 'label for button in the gallery widget; should not be longer than ~13 characters long' ), 'edit_media' => _x( 'Edit Gallery', 'label for button in the gallery widget; should not be longer than ~13 characters long' ), 'missing_attachment' => sprintf( - /* translators: placeholder is URL to media library */ + /* translators: placeholder is URL to media library */ __( 'We can’t find that gallery. Check your media library and make sure it wasn’t deleted.' ), esc_url( admin_url( 'upload.php' ) ) ), @@ -107,9 +107,11 @@ public function render_media( $instance ) { 'ids' => $instance['ids'], ); + // @codingStandardsIgnoreStart if ( $instance['orderby_random'] ) { $shortcode_atts['orderby'] = 'rand'; } + // @codingStandardsIgnoreEnd echo gallery_shortcode( $shortcode_atts ); } @@ -170,7 +172,7 @@ public function render_control_template_scripts() {

l10n['missing_attachment']; ?>

- <# } else if ( data.attachments.length ) { #> + <# } else if ( Array.isArray( data.attachments ) && data.attachments.length ) { #>
<# _.each( data.attachments, function( attachment, index ) { #>
From 88a5d0ba24cdc9b111aa0ddff1a0d185990d4733 Mon Sep 17 00:00:00 2001 From: Timmy Crawford Date: Wed, 2 Aug 2017 10:15:45 -0700 Subject: [PATCH 07/39] Rebase and get things somewhat operational again. --- core-media-widgets.php | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/core-media-widgets.php b/core-media-widgets.php index 7a7c31d..682c2b4 100644 --- a/core-media-widgets.php +++ b/core-media-widgets.php @@ -58,7 +58,6 @@ function wp32417_default_scripts( WP_Scripts $scripts ) { $scripts->add( $handle, $src, array( 'media-widgets' ) ); } -<<<<<<< 1089ca34acba917e303f4b8a72e72284d63135cb $handle = 'media-video-widget'; $src = plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-video-widget.js'; if ( ! $scripts->query( $handle, 'registered' ) ) { @@ -70,12 +69,8 @@ function wp32417_default_scripts( WP_Scripts $scripts ) { if ( ! $scripts->query( $handle, 'registered' ) ) { $scripts->add( $handle, $src, array( 'media-widgets', 'media-audiovideo' ) ); } -======= - $scripts->add( 'media-audio-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-audio-widget.js', array( 'media-widgets', 'media-audiovideo' ) ); + $scripts->add( 'media-gallery-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-gallery-widget.js', array( 'media-widgets' ) ); - $scripts->add( 'media-image-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-image-widget.js', array( 'media-widgets' ) ); - $scripts->add( 'media-video-widget', plugin_dir_url( __FILE__ ) . 'wp-admin/js/widgets/media-video-widget.js', array( 'media-widgets', 'media-audiovideo' ) ); ->>>>>>> [WIP] Gallery Widget if ( ! WP_CORE_MEDIA_WIDGETS_MERGED ) { $scripts->add_inline_script( 'customize-selective-refresh', file_get_contents( dirname( __FILE__ ) . '/wp-includes/js/customize-selective-refresh-extras.js' ) ); @@ -140,14 +135,12 @@ function wp32417_twentyten_styles() { * @codeCoverageIgnore */ function wp32417_widgets_init() { -<<<<<<< 1089ca34acba917e303f4b8a72e72284d63135cb - $class_files = array( - 'WP_Widget_Media' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media.php', - 'WP_Widget_Media_Image' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-image.php', - 'WP_Widget_Media_Video' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-video.php', - 'WP_Widget_Media_Audio' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-audio.php', - 'WP_Widget_Media_Gallery' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-gallery.php' ); + 'WP_Widget_Media' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media.php', + 'WP_Widget_Media_Image' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-image.php', + 'WP_Widget_Media_Video' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-video.php', + 'WP_Widget_Media_Audio' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-audio.php', + 'WP_Widget_Media_Gallery' => dirname( __FILE__ ) . '/wp-includes/widgets/class-wp-widget-media-gallery.php', ); foreach ( $class_files as $class => $file ) { if ( ! class_exists( $class ) ) { From 984e68f388294ab278bc74643f3ce6baec837203 Mon Sep 17 00:00:00 2001 From: m1tk00-devv Date: Wed, 9 Aug 2017 11:46:45 +0200 Subject: [PATCH 08/39] Fix preview for gallery /** * TODO fix edit button */ --- wp-admin/js/widgets/media-gallery-widget.js | 98 +++++++++++++++++-- .../widgets/class-wp-widget-media-gallery.php | 36 ++++++- 2 files changed, 122 insertions(+), 12 deletions(-) diff --git a/wp-admin/js/widgets/media-gallery-widget.js b/wp-admin/js/widgets/media-gallery-widget.js index 843b0c2..e8a8764 100644 --- a/wp-admin/js/widgets/media-gallery-widget.js +++ b/wp-admin/js/widgets/media-gallery-widget.js @@ -26,7 +26,7 @@ toolbar: 'main-gallery', filterable: 'uploaded', multiple: 'add', - editable: false, + editable: true, library: wp.media.query( _.defaults({ type: 'image' @@ -75,7 +75,89 @@ previewTemplate = wp.template( 'wp-media-widget-gallery-preview' ); previewContainer.html( previewTemplate( control.previewTemplateProps.toJSON() ) ); }, + isSelected: function isSelected() { + var control = this; + if ( control.model.get( 'error' ) ) { + return false; + } + + return Boolean( control.model.get( 'ids' ) || control.model.get( 'attachments' ) ); + }, + /** + * Open the media select frame to edit images. + * + * @returns {void} + */ + editMedia: function editMedia() { + var control = this, selection, mediaFrame, defaultSync, mediaFrameProps; + if ( control.isSelected() && 0 !== control.model.get( 'selection' ) ) { + selection = new wp.media.model.Selection( JSON.parse( control.model.get( 'attachments') ) ); + } else { + selection = null; + } + + mediaFrameProps = control.mapModelToMediaFrameProps( control.model.toJSON() ); + if ( mediaFrameProps.size ) { + control.displaySettings.set( 'size', mediaFrameProps.size ); + } + mediaFrame = new GalleryDetailsMediaFrame({ + frame: 'select', + text: control.l10n.add_to_widget, + selection: selection, + mimeType: control.mime_type, + selectedDisplaySettings: control.displaySettings, + showDisplaySettings: control.showDisplaySettings, + metadata: mediaFrameProps, + state: 'gallery' + }); + wp.media.frame = mediaFrame; // See wp.media(). + + // Handle selection of a media item. + mediaFrame.on( 'update', function onUpdate( selections ) { + var state = mediaFrame.state(), selectedImages; + + selectedImages = selections || state.get( 'selection' ); + if ( ! selectedImages ) { + return; + } + + // Update widget instance. + control.model.set( { + ids: _.pluck( selectedImages.models, 'id' ).join( ',' ), + attachments: JSON.stringify( + selectedImages.models.map( function( model ) { + return model.toJSON(); + } ) + ), + selection: selectedImages, + } ); + } ); + + // Disable syncing of attachment changes back to server. See . + defaultSync = wp.media.model.Attachment.prototype.sync; + wp.media.model.Attachment.prototype.sync = function rejectedSync() { + return $.Deferred().rejectWith( this ).promise(); + }; + mediaFrame.on( 'close', function onClose() { + wp.media.model.Attachment.prototype.sync = defaultSync; + }); + + mediaFrame.$el.addClass( 'media-widget' ); + mediaFrame.open(); + + // Clear the selected attachment when it is deleted in the media select frame. + if ( selection ) { + selection.on( 'destroy', function onDestroy( attachment ) { + if ( control.model.get( 'attachment_id' ) === attachment.get( 'id' ) ) { + control.model.set({ + attachment_id: 0, + url: '' + }); + } + }); + } + }, /** * Open the media select frame to chose an item. * @@ -83,8 +165,7 @@ */ selectMedia: function selectMedia() { var control = this, selection, mediaFrame, defaultSync, mediaFrameProps; - - if ( control.isSelected() && 0 !== control.model.get( 'attachment_id' ) ) { + if ( control.isSelected() && 0 !== control.model.get( 'selection' ) ) { selection = new wp.media.model.Selection( [ control.selectedAttachment ] ); } else { selection = null; @@ -94,7 +175,6 @@ if ( mediaFrameProps.size ) { control.displaySettings.set( 'size', mediaFrameProps.size ); } - mediaFrame = new GalleryDetailsMediaFrame({ frame: 'select', text: control.l10n.add_to_widget, @@ -120,9 +200,12 @@ // Update widget instance. control.model.set( { ids: _.pluck( selectedImages.models, 'id' ).join( ',' ), - attachments: selectedImages.models.map( function( model ) { - return model.toJSON(); - } ) + attachments: JSON.stringify( + selectedImages.models.map( function( model ) { + return model.toJSON(); + } ) + ), + selection: selectedImages, } ); } ); @@ -156,6 +239,7 @@ */ mediaFrame.$el.find( ':focusable:first' ).focus(); } + } ); // Exports. diff --git a/wp-includes/widgets/class-wp-widget-media-gallery.php b/wp-includes/widgets/class-wp-widget-media-gallery.php index b2b191c..e248b48 100644 --- a/wp-includes/widgets/class-wp-widget-media-gallery.php +++ b/wp-includes/widgets/class-wp-widget-media-gallery.php @@ -85,8 +85,8 @@ public function get_instance_schema() { 'should_preview_update' => false, ), 'attachments' => array( - 'type' => 'array', - 'default' => array(), + 'type' => 'string', + 'default' => '', ), ) ); @@ -106,7 +106,6 @@ public function render_media( $instance ) { $shortcode_atts = array( 'ids' => $instance['ids'], ); - // @codingStandardsIgnoreStart if ( $instance['orderby_random'] ) { $shortcode_atts['orderby'] = 'rand'; @@ -163,15 +162,15 @@ public function enqueue_admin_scripts() { */ public function render_control_template_scripts() { parent::render_control_template_scripts(); - ?> Date: Wed, 9 Aug 2017 14:17:27 -0700 Subject: [PATCH 09/39] Fix linting errors. --- wp-admin/js/widgets/media-gallery-widget.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/js/widgets/media-gallery-widget.js b/wp-admin/js/widgets/media-gallery-widget.js index e8a8764..a94b622 100644 --- a/wp-admin/js/widgets/media-gallery-widget.js +++ b/wp-admin/js/widgets/media-gallery-widget.js @@ -92,7 +92,7 @@ editMedia: function editMedia() { var control = this, selection, mediaFrame, defaultSync, mediaFrameProps; if ( control.isSelected() && 0 !== control.model.get( 'selection' ) ) { - selection = new wp.media.model.Selection( JSON.parse( control.model.get( 'attachments') ) ); + selection = new wp.media.model.Selection( JSON.parse( control.model.get( 'attachments' ) ) ); } else { selection = null; } @@ -130,7 +130,7 @@ return model.toJSON(); } ) ), - selection: selectedImages, + selection: selectedImages } ); } ); @@ -205,7 +205,7 @@ return model.toJSON(); } ) ), - selection: selectedImages, + selection: selectedImages } ); } ); From a06306025908ff5395b3e2b84b58b18847a6ea94 Mon Sep 17 00:00:00 2001 From: Timmy Crawford Date: Tue, 15 Aug 2017 16:51:12 -0700 Subject: [PATCH 10/39] Not sure how to fix travis failing, trying this. --- phpcs.xml.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index bc3608f..a8f83b7 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -7,6 +7,7 @@ + From 69e7a8fcfa1366a3b3e088a66f8953690b8a0d50 Mon Sep 17 00:00:00 2001 From: Timmy Crawford Date: Tue, 15 Aug 2017 16:56:35 -0700 Subject: [PATCH 11/39] try that again --- phpcs.xml.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index a8f83b7..81b66f4 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -7,7 +7,7 @@ - + From ac13f7c9faf0616b56b1efcadf1911df5a58c59f Mon Sep 17 00:00:00 2001 From: Timmy Crawford Date: Tue, 15 Aug 2017 17:00:46 -0700 Subject: [PATCH 12/39] Remove another rule to try and get CI to pass. --- phpcs.xml.dist | 1 + 1 file changed, 1 insertion(+) diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 81b66f4..1f3fddb 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -8,6 +8,7 @@ + From 41b6ea95c54685bc5d730216ce6182890c8036c3 Mon Sep 17 00:00:00 2001 From: m1tk00-devv Date: Wed, 16 Aug 2017 11:27:27 +0200 Subject: [PATCH 13/39] Fix edit gallery button --- wp-admin/js/widgets/media-gallery-widget.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/wp-admin/js/widgets/media-gallery-widget.js b/wp-admin/js/widgets/media-gallery-widget.js index a94b622..ebeb0e6 100644 --- a/wp-admin/js/widgets/media-gallery-widget.js +++ b/wp-admin/js/widgets/media-gallery-widget.js @@ -92,7 +92,9 @@ editMedia: function editMedia() { var control = this, selection, mediaFrame, defaultSync, mediaFrameProps; if ( control.isSelected() && 0 !== control.model.get( 'selection' ) ) { - selection = new wp.media.model.Selection( JSON.parse( control.model.get( 'attachments' ) ) ); + selection = new wp.media.model.Selection( JSON.parse( control.model.get( 'attachments' ) ), { + multiple: true + }); } else { selection = null; } @@ -102,14 +104,16 @@ control.displaySettings.set( 'size', mediaFrameProps.size ); } mediaFrame = new GalleryDetailsMediaFrame({ - frame: 'select', + frame: 'manage', text: control.l10n.add_to_widget, selection: selection, mimeType: control.mime_type, selectedDisplaySettings: control.displaySettings, showDisplaySettings: control.showDisplaySettings, metadata: mediaFrameProps, - state: 'gallery' + editing: true, + multiple: true, + state: 'gallery-edit' }); wp.media.frame = mediaFrame; // See wp.media(). @@ -118,6 +122,7 @@ var state = mediaFrame.state(), selectedImages; selectedImages = selections || state.get( 'selection' ); + if ( ! selectedImages ) { return; } From 9469601c21269f20eb7ad608906b3fd0bb505546 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Wed, 16 Aug 2017 12:11:13 -0700 Subject: [PATCH 14/39] Fix unit tests for WP 4.8 --- tests/phpunit/test-class-wp-widget-media-video.php | 2 -- tests/phpunit/test-class-wp-widget-media.php | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/phpunit/test-class-wp-widget-media-video.php b/tests/phpunit/test-class-wp-widget-media-video.php index 4d3d77a..5c68ce7 100644 --- a/tests/phpunit/test-class-wp-widget-media-video.php +++ b/tests/phpunit/test-class-wp-widget-media-video.php @@ -238,7 +238,6 @@ function test_enqueue_preview_scripts() { $widget->enqueue_preview_scripts(); $this->assertTrue( wp_script_is( 'wp-mediaelement' ) ); $this->assertTrue( wp_style_is( 'wp-mediaelement' ) ); - $this->assertTrue( wp_script_is( 'froogaloop' ) ); $wp_scripts = null; $wp_styles = null; @@ -246,7 +245,6 @@ function test_enqueue_preview_scripts() { $widget->enqueue_preview_scripts(); $this->assertFalse( wp_script_is( 'wp-mediaelement' ) ); $this->assertFalse( wp_style_is( 'wp-mediaelement' ) ); - $this->assertTrue( wp_script_is( 'froogaloop' ) ); } /** diff --git a/tests/phpunit/test-class-wp-widget-media.php b/tests/phpunit/test-class-wp-widget-media.php index cfab4d7..568a86b 100644 --- a/tests/phpunit/test-class-wp-widget-media.php +++ b/tests/phpunit/test-class-wp-widget-media.php @@ -386,7 +386,9 @@ function test_enqueue_admin_scripts() { $widget->enqueue_admin_scripts(); $this->assertTrue( wp_script_is( 'media-widgets' ) ); - $this->assertTrue( wp_style_is( 'media-widgets' ) ); + if ( version_compare( strtok( get_bloginfo( 'version' ), '-' ), '4.8', '<=' ) ) { + $this->assertTrue( wp_style_is( 'media-widgets' ) ); + } } /** From aebe8646806abaaceb99c290fc9e913aea4ee882 Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Wed, 16 Aug 2017 12:14:30 -0700 Subject: [PATCH 15/39] Skip phpcs on PHP 5.2 --- .dev-lib | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.dev-lib b/.dev-lib index 7027c74..2ef365d 100644 --- a/.dev-lib +++ b/.dev-lib @@ -2,3 +2,7 @@ CHECK_SCOPE=changed-files PHPCS_RULESET_FILE=phpcs.xml.dist WPCS_BRANCH=develop PHPCS_PHAR_URL=https://github.com/squizlabs/PHP_CodeSniffer/releases/download/2.9.0/phpcs.phar + +if [[ ${TRAVIS_PHP_VERSION:0:3} == "5.2" ]]; then + DEV_LIB_SKIP="$DEV_LIB_SKIP,phpcs" +fi From 19c44bd4848c093ed1af06d7bd386c5e8719b2cf Mon Sep 17 00:00:00 2001 From: Weston Ruter Date: Wed, 16 Aug 2017 12:14:57 -0700 Subject: [PATCH 16/39] Update dev-lib --- dev-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lib b/dev-lib index fd0b392..b10f5e2 160000 --- a/dev-lib +++ b/dev-lib @@ -1 +1 @@ -Subproject commit fd0b392c8b5e0867010965cac769d69744a36ccb +Subproject commit b10f5e2516f1c237f03685d000f60e5cabcadcab From 18896da03341b81e75bc22e17d21253bba48aa4b Mon Sep 17 00:00:00 2001 From: Timmy Crawford Date: Wed, 23 Aug 2017 10:37:44 -0700 Subject: [PATCH 17/39] Updates and qunit tests. --- dev-lib | 2 +- php/class-media-widgets-wp-cli-command.php | 1 + phpcs.xml.dist | 2 - tests/qunit/index.html | 273 ++++++++++-------- tests/qunit/test-media-gallery-widget.js | 46 +++ tests/qunit/test-media-image-widget.js | 4 +- tests/qunit/test-suite.template | 1 + wp-admin/js/widgets/media-gallery-widget.js | 34 ++- .../widgets/class-wp-widget-media-gallery.php | 11 +- 9 files changed, 237 insertions(+), 137 deletions(-) create mode 100644 tests/qunit/test-media-gallery-widget.js diff --git a/dev-lib b/dev-lib index b10f5e2..fd0b392 160000 --- a/dev-lib +++ b/dev-lib @@ -1 +1 @@ -Subproject commit b10f5e2516f1c237f03685d000f60e5cabcadcab +Subproject commit fd0b392c8b5e0867010965cac769d69744a36ccb diff --git a/php/class-media-widgets-wp-cli-command.php b/php/class-media-widgets-wp-cli-command.php index a62d41d..8d83465 100644 --- a/php/class-media-widgets-wp-cli-command.php +++ b/php/class-media-widgets-wp-cli-command.php @@ -46,6 +46,7 @@ class Media_Widgets_WP_CLI_Command extends WP_CLI_Command { 'media-image-widget', 'media-video-widget', 'media-audio-widget', + 'media-gallery-widget', ); /** diff --git a/phpcs.xml.dist b/phpcs.xml.dist index 1f3fddb..bc3608f 100644 --- a/phpcs.xml.dist +++ b/phpcs.xml.dist @@ -7,8 +7,6 @@ - - diff --git a/tests/qunit/index.html b/tests/qunit/index.html index 8091f40..86c503f 100644 --- a/tests/qunit/index.html +++ b/tests/qunit/index.html @@ -15,7 +15,72 @@