From 44b8c2e36bd08d4db880674a11972e4d2e09e1e2 Mon Sep 17 00:00:00 2001 From: atimmer Date: Thu, 5 Jul 2018 14:07:24 +0000 Subject: [PATCH] Docs: Fix default values for `customize/controls.js`. The old values cannot be parsed by JSDoc. Props herregroen. Fixes #44520. Built from https://develop.svn.wordpress.org/trunk@43391 git-svn-id: http://core.svn.wordpress.org/trunk@43219 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/js/customize-controls.js | 60 +++++++++++++++---------------- wp-includes/version.php | 2 +- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/wp-admin/js/customize-controls.js b/wp-admin/js/customize-controls.js index bfd21c627b..357964fcf9 100644 --- a/wp-admin/js/customize-controls.js +++ b/wp-admin/js/customize-controls.js @@ -938,16 +938,16 @@ * * @borrows wp.customize~focus as focus * - * @param {string} id - The ID for the container. - * @param {object} options - Object containing one property: params. - * @param {string} options.title - Title shown when panel is collapsed and expanded. - * @param {string=} [options.description] - Description shown at the top of the panel. - * @param {number=100} [options.priority] - The sort priority for the panel. - * @param {string} [options.templateId] - Template selector for container. - * @param {string=default} [options.type] - The type of the panel. See wp.customize.panelConstructor. - * @param {string=} [options.content] - The markup to be used for the panel container. If empty, a JS template is used. - * @param {boolean=true} [options.active] - Whether the panel is active or not. - * @param {object} [options.params] - Deprecated wrapper for the above properties. + * @param {string} id - The ID for the container. + * @param {object} options - Object containing one property: params. + * @param {string} options.title - Title shown when panel is collapsed and expanded. + * @param {string} [options.description] - Description shown at the top of the panel. + * @param {number} [options.priority=100] - The sort priority for the panel. + * @param {string} [options.templateId] - Template selector for container. + * @param {string} [options.type=default] - The type of the panel. See wp.customize.panelConstructor. + * @param {string} [options.content] - The markup to be used for the panel container. If empty, a JS template is used. + * @param {boolean} [options.active=true] - Whether the panel is active or not. + * @param {object} [options.params] - Deprecated wrapper for the above properties. */ initialize: function ( id, options ) { var container = this; @@ -1406,17 +1406,17 @@ * * @since 4.1.0 * - * @param {string} id - The ID for the section. - * @param {object} options - Options. - * @param {string} options.title - Title shown when section is collapsed and expanded. - * @param {string=} [options.description] - Description shown at the top of the section. - * @param {number=100} [options.priority] - The sort priority for the section. - * @param {string=default} [options.type] - The type of the section. See wp.customize.sectionConstructor. - * @param {string=} [options.content] - The markup to be used for the section container. If empty, a JS template is used. - * @param {boolean=true} [options.active] - Whether the section is active or not. - * @param {string} options.panel - The ID for the panel this section is associated with. - * @param {string=} [options.customizeAction] - Additional context information shown before the section title when expanded. - * @param {object} [options.params] - Deprecated wrapper for the above properties. + * @param {string} id - The ID for the section. + * @param {object} options - Options. + * @param {string} options.title - Title shown when section is collapsed and expanded. + * @param {string} [options.description] - Description shown at the top of the section. + * @param {number} [options.priority=100] - The sort priority for the section. + * @param {string} [options.type=default] - The type of the section. See wp.customize.sectionConstructor. + * @param {string} [options.content] - The markup to be used for the section container. If empty, a JS template is used. + * @param {boolean} [options.active=true] - Whether the section is active or not. + * @param {string} options.panel - The ID for the panel this section is associated with. + * @param {string} [options.customizeAction] - Additional context information shown before the section title when expanded. + * @param {object} [options.params] - Deprecated wrapper for the above properties. */ initialize: function ( id, options ) { var section = this, params; @@ -2756,15 +2756,15 @@ * * @since 4.1.0 * - * @param {string} id - The ID for the panel. - * @param {object} options - Object containing one property: params. - * @param {string} options.title - Title shown when panel is collapsed and expanded. - * @param {string=} [options.description] - Description shown at the top of the panel. - * @param {number=100} [options.priority] - The sort priority for the panel. - * @param {string=default} [options.type] - The type of the panel. See wp.customize.panelConstructor. - * @param {string=} [options.content] - The markup to be used for the panel container. If empty, a JS template is used. - * @param {boolean=true} [options.active] - Whether the panel is active or not. - * @param {object} [options.params] - Deprecated wrapper for the above properties. + * @param {string} id - The ID for the panel. + * @param {object} options - Object containing one property: params. + * @param {string} options.title - Title shown when panel is collapsed and expanded. + * @param {string} [options.description] - Description shown at the top of the panel. + * @param {number} [options.priority=100] - The sort priority for the panel. + * @param {string} [options.type=default] - The type of the panel. See wp.customize.panelConstructor. + * @param {string} [options.content] - The markup to be used for the panel container. If empty, a JS template is used. + * @param {boolean} [options.active=true] - Whether the panel is active or not. + * @param {object} [options.params] - Deprecated wrapper for the above properties. */ initialize: function ( id, options ) { var panel = this, params; diff --git a/wp-includes/version.php b/wp-includes/version.php index 313b26055e..eaac2cd7d5 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '5.0-alpha-43390'; +$wp_version = '5.0-alpha-43391'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.