Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce “add new” buttons after the Select2 to invoke Customize Posts post insertion #2

Merged
merged 1 commit into from
Jun 3, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
105 changes: 104 additions & 1 deletion js/customize-object-selector-control.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
/* global wp */
/* eslint consistent-this: [ "error", "control" ] */
/* eslint no-magic-numbers: ["error", { "ignore": [0,1] }] */
/* eslint complexity: ["error", 8] */

(function( api, $ ) {
'use strict';
Expand All @@ -14,7 +16,7 @@
api.ObjectSelectorControl = api.Control.extend({

initialize: function( id, options ) {
var control = this, args;
var control = this, args, postTypes = [];

args = options || {};

Expand Down Expand Up @@ -44,6 +46,35 @@
args.params.content.attr( 'class', 'customize-control customize-control-' + args.params.type );
}

// Set up parameters for post_addition_buttons.
if ( _.isUndefined( args.params.post_addition_buttons ) && api.Posts && api.Posts.insertAutoDraftPost ) {
if ( ! args.params.post_query_args.post_type ) {
postTypes = [ 'post' ];
} else if ( _.isArray( args.params.post_query_args.post_type ) ) {
postTypes = args.params.post_query_args.post_type;
} else {
postTypes = args.params.post_query_args.post_type.split( /,/ );
}

postTypes = _.filter( postTypes, function ( postType ) {
return ! _.isUndefined( api.Posts.data.postTypes[ postType ] ) && api.Posts.data.postTypes[ postType ].show_in_customizer;
} );

args.params.post_addition_buttons = [];
_.each( postTypes, function( postType ) {
var label;
if ( postTypes.length > 1 ) {
label = api.Posts.data.postTypes[ postType ].labels.add_new_item || api.Posts.data.postTypes[ postType ].labels.add_new;
} else {
label = api.Posts.data.postTypes[ postType ].labels.add_new || api.Posts.data.postTypes[ postType ].labels.add_new_item;
}
args.params.post_addition_buttons.push( {
post_type: postType,
label: label
} );
} );
}

// @todo Add support for settingSubproperty (e.g. so we can map a post_parent property of a post setting).
api.Control.prototype.initialize.call( control, id, args );
},
Expand Down Expand Up @@ -114,6 +145,8 @@

control.setupSortable();

control.setupAddNewButtons();

api.Control.prototype.ready.call( control );
},

Expand Down Expand Up @@ -203,6 +236,76 @@
});
},

/**
* Setup buttons for adding new posts.
*
* @returns {void}
*/
setupAddNewButtons: function setupAddNewButtons() {
var control = this;

// Set up the add new post buttons
control.container.on( 'click', '.add-new-post-button', function() {
var promise, button;
button = $( this );
button.prop( 'disabled', true );
promise = api.Posts.insertAutoDraftPost( $( this ).data( 'postType' ) );

promise.done( function( data ) {
var returnPromise = focusConstructWithBreadcrumb( data.section, control );
data.section.focus();
returnPromise.done( function() {
var values;
if ( 'publish' === data.setting.get().post_status ) {
values = control.getSettingValues().slice( 0 );
if ( ! control.params.select2_options.multiple ) {
values = [ data.postId ];
} else {
// @todo Really the add new buttons should be disabled when the limit is reached.
if ( control.params.select2_options.multiple && control.params.select2_options.limit >= values.length ) {
values.length = control.params.select2_options.limit - 1;
}
values.unshift( data.postId )
}
control.setSettingValues( values );
}
button.focus(); // @todo Focus on the select2?
} );
} );

promise.always( function() {
button.prop( 'disabled', false );
} );
} );

/**
* Focus (expand) one construct and then focus on another construct after the first is collapsed.
*
* This overrides the back button to serve the purpose of breadcrumb navigation.
* This is modified from WP Core.
*
* @link https://github.com/xwp/wordpress-develop/blob/e7bbb482d6069d9c2d0e33789c7d290ac231f056/src/wp-admin/js/customize-widgets.js#L2143-L2193
* @param {wp.customize.Section|wp.customize.Panel|wp.customize.Control} focusConstruct - The object to initially focus.
* @param {wp.customize.Section|wp.customize.Panel|wp.customize.Control} returnConstruct - The object to return focus.
*/
function focusConstructWithBreadcrumb( focusConstruct, returnConstruct ) {
var deferred = $.Deferred();
focusConstruct.focus();
function onceCollapsed( isExpanded ) {
if ( ! isExpanded ) {
focusConstruct.expanded.unbind( onceCollapsed );
returnConstruct.focus( {
completeCallback: function() {
deferred.resolve();
}
} );
}
}
focusConstruct.expanded.bind( onceCollapsed );
return deferred;
}
},

/**
* Re-populate the select options based on the current setting value.
*
Expand Down
12 changes: 4 additions & 8 deletions php/class-control.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,11 @@ protected function content_template() {
{{{ key }}}="{{ value }}"
<# } ) #>
/>
<# if ( data.show_addition_buttons && postTypes.length > 0 ) { #>
<# if ( ! _.isEmpty( data.post_addition_buttons ) ) { #>
<span class="add-new-post">
<# if ( 1 === postTypes.length ) { #>
<button type="button" class="button secondary-button">Add {{ postTypes[0] }}…</button>
<# } else { #>
<# _.each( postTypes, function( post_type ) { #>
<button type="button" class="button secondary-button">Add {{ post_type }}…</button>
<# } ) #>
<# } #>
<# _.each( data.post_addition_buttons, function( button ) { #>
<button type="button" class="button secondary-button add-new-post-button" data-post-type="{{ button.post_type }}">{{ button.label }}</button>
<# } ) #>
</span>
<# } #>
<div class="customize-control-notifications"></div>
Expand Down