Skip to content

Commit 374f911

Browse files
ShaneMuirShaneMuir
committed
Merge remote-tracking branch 'origin/trunk' into fix/kses-allow-text-fragments
2 parents 3b3ad66 + 73ea9ac commit 374f911

107 files changed

Lines changed: 783 additions & 614 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc-jsdoc.js‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,21 @@ module.exports = [
3636
},
3737
},
3838
rules: {
39+
'jsdoc/check-alignment': 'error',
40+
'jsdoc/check-indentation': [ 'error', {
41+
excludeTags: [
42+
'deprecated',
43+
'example',
44+
'param',
45+
'property',
46+
'return',
47+
'since',
48+
'todo',
49+
],
50+
} ],
51+
'jsdoc/check-line-alignment': [ 'error', 'always', {
52+
tags: [ 'param', 'property' ],
53+
} ],
3954
'jsdoc/check-param-names': 'error',
4055
'jsdoc/check-syntax': 'error',
4156
'jsdoc/check-tag-names': [ 'error', {
@@ -48,10 +63,12 @@ module.exports = [
4863
} ],
4964
'jsdoc/check-types': 'error',
5065
'jsdoc/require-description': 'error',
66+
'jsdoc/require-hyphen-before-param-description': [ 'error', 'never' ],
5167
'jsdoc/require-jsdoc': 'error',
5268
'jsdoc/require-param': [ 'error', {
5369
enableFixer: false,
5470
} ],
71+
'jsdoc/require-param-description': 'error',
5572
'jsdoc/require-param-name': 'error',
5673
'jsdoc/require-param-type': 'error',
5774
'jsdoc/require-returns': 'error',

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"ext-igbinary": "*",
3030
"ext-imagick": "*",
3131
"ext-intl": "*",
32+
"ext-libxml": "*",
3233
"ext-mbstring": "*",
3334
"ext-memcached": "*",
3435
"ext-mysqli": "*",

‎src/js/_enqueues/admin/application-passwords.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,8 +172,8 @@
172172
*
173173
* @since 5.6.0
174174
*
175-
* @param {jqXHR} xhr The XHR object from the ajax call.
176-
* @param {string} textStatus The string categorizing the ajax request's status.
175+
* @param {jqXHR} xhr The XHR object from the ajax call.
176+
* @param {string} textStatus The string categorizing the ajax request's status.
177177
* @param {string} errorThrown The HTTP status error text.
178178
*/
179179
function handleErrorResponse( xhr, textStatus, errorThrown ) {

‎src/js/_enqueues/admin/common.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@
22
* @output wp-admin/js/common.js
33
*/
44

5-
/* global setUserSetting, ajaxurl, alert, confirm, pagenow */
6-
/* global columns, screenMeta */
5+
/* global setUserSetting, ajaxurl, alert, confirm, pagenow, columns, screenMeta */
76

87
/**
9-
* Adds common WordPress functionality to the window.
8+
* Adds common WordPress functionality to the window.
109
*
11-
* @param {JQueryStatic} $ The jQuery object.
12-
* @param {Object} window The window object.
13-
* @param {*} undefined Unused.
10+
* @param {JQueryStatic} $ The jQuery object.
11+
* @param {Object} window The window object.
12+
* @param {*} undefined Unused.
1413
*/
1514
( function( $, window, undefined ) {
1615
var $document = $( document ),
@@ -568,8 +567,8 @@ window.showNotice = {
568567
* @since 3.2.0
569568
*
570569
* @type {{element: null, toggles: null, page: null, init: screenMeta.init,
571-
* toggleEvent: screenMeta.toggleEvent, open: screenMeta.open,
572-
* close: screenMeta.close}}
570+
* toggleEvent: screenMeta.toggleEvent, open: screenMeta.open,
571+
* close: screenMeta.close}}
573572
*
574573
* @return {void}
575574
*/
@@ -980,8 +979,8 @@ $( function() {
980979

981980
/*
982981
* Show the sub instead of following the link if:
983-
* - the submenu is not open.
984-
* - the submenu is not shown inline or the menu is not folded.
982+
* - the submenu is not open.
983+
* - the submenu is not shown inline or the menu is not folded.
985984
*/
986985
if ( ! $menuItem.hasClass( 'opensub' ) && ( ! $menuItem.hasClass( 'wp-menu-open' ) || $menuItem.width() < 40 ) ) {
987986
event.preventDefault();
@@ -1485,7 +1484,7 @@ $( function() {
14851484
* @param {Event} e The event object.
14861485
*
14871486
* @return {void}
1488-
*/
1487+
*/
14891488
$('#contextual-help-link, #show-settings-link').on( 'focus.scroll-into-view', function(e){
14901489
if ( e.target.scrollIntoViewIfNeeded )
14911490
e.target.scrollIntoViewIfNeeded(false);

‎src/js/_enqueues/admin/custom-background.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
* @since 3.5.0
125125
*
126126
* @return {void}
127-
*/
127+
*/
128128
frame.on( 'select', function() {
129129
// Grab the selected attachment.
130130
var attachment = frame.state().get('selection').first();

‎src/js/_enqueues/admin/edit-comments.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var getCount, updateCount, updateCountText, updatePending, updateApproved,
4242
* @access private
4343
*
4444
* @param {jQuery} el The jQuery element to update.
45-
* @param {number} n Number to be put in the element.
45+
* @param {number} n Number to be put in the element.
4646
*
4747
* @return {void}
4848
*/
@@ -68,7 +68,7 @@ var getCount, updateCount, updateCountText, updatePending, updateApproved,
6868
* @since 4.4.0
6969
* @access private
7070
*
71-
* @param {number} diff The amount to lower or raise the approved count with.
71+
* @param {number} diff The amount to lower or raise the approved count with.
7272
* @param {number} commentPostId The ID of the post to be updated.
7373
*
7474
* @return {void}
@@ -122,7 +122,7 @@ var getCount, updateCount, updateCountText, updatePending, updateApproved,
122122
*
123123
* @param {string} selector The jQuery selector for elements to update a count
124124
* for.
125-
* @param {number} diff The amount to lower or raise the count with.
125+
* @param {number} diff The amount to lower or raise the count with.
126126
*
127127
* @return {void}
128128
*/
@@ -231,7 +231,7 @@ var getCount, updateCount, updateCountText, updatePending, updateApproved,
231231
* @since 3.2.0
232232
* @access private
233233
*
234-
* @param {number} diff The amount to lower or raise the pending count with.
234+
* @param {number} diff The amount to lower or raise the pending count with.
235235
* @param {number} commentPostId The ID of the post to be updated.
236236
*
237237
* @return {void}
@@ -322,9 +322,9 @@ window.setCommentsList = function() {
322322
* @since 2.8.0
323323
* @access private
324324
*
325-
* @param {number} total Total number of comments.
326-
* @param {number} time Unix timestamp of response.
327-
* @param {boolean} setConfidentTime Whether to update the last confident time
325+
* @param {number} total Total number of comments.
326+
* @param {number} time Unix timestamp of response.
327+
* @param {boolean} setConfidentTime Whether to update the last confident time
328328
* with the given time.
329329
*
330330
* @return {void}
@@ -345,7 +345,7 @@ window.setCommentsList = function() {
345345
* @since 2.5.0
346346
* @access private
347347
*
348-
* @param {Object} r Ajax response object.
348+
* @param {Object} r Ajax response object.
349349
* @param {Object} settings Settings for the wpList object.
350350
*
351351
* @return {void}
@@ -398,8 +398,8 @@ window.setCommentsList = function() {
398398
* @since 2.8.0
399399
* @access private
400400
*
401-
* @param {Object} settings Settings for the wpList object.
402-
* @param {HTMLElement} list Comments table element.
401+
* @param {Object} settings Settings for the wpList object.
402+
* @param {HTMLElement} list Comments table element.
403403
*
404404
* @return {Object} The settings object.
405405
*/
@@ -471,7 +471,7 @@ window.setCommentsList = function() {
471471
* @since 2.5.0
472472
* @access private
473473
*
474-
* @param {Object} r Ajax response object.
474+
* @param {Object} r Ajax response object.
475475
* @param {Object} settings Settings for the wpList object.
476476
*
477477
* @return {void}
@@ -945,8 +945,8 @@ window.commentReply = {
945945
* @memberof commentReply
946946
*
947947
* @param {number} comment_id The comment ID to open an editor for.
948-
* @param {number} post_id The post ID to open an editor for.
949-
* @param {string} action The action to perform. Either 'edit' or 'replyto'.
948+
* @param {number} post_id The post ID to open an editor for.
949+
* @param {string} action The action to perform. Either 'edit' or 'replyto'.
950950
*
951951
* @return {boolean} Always false.
952952
*/

‎src/js/_enqueues/admin/inline-edit-post.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ window.wp = window.wp || {};
1818
*
1919
* @type {Object}
2020
*
21-
* @property {string} type The type of inline editor.
22-
* @property {string} what The prefix before the post ID.
21+
* @property {string} type The type of inline editor.
22+
* @property {string} what The prefix before the post ID.
2323
*
24-
* @param {JQueryStatic} $ The jQuery object.
25-
* @param {wp} wp The WordPress global object.
24+
* @param {JQueryStatic} $ The jQuery object.
25+
* @param {wp} wp The WordPress global object.
2626
*
2727
*/
2828
( function( $, wp ) {

‎src/js/_enqueues/admin/inline-edit-tax.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ window.wp = window.wp || {};
1313
*
1414
* @namespace inlineEditTax
1515
*
16-
* @property {string} type The type of inline edit we are currently on.
17-
* @property {string} what The type property with a hash prefixed and a dash
18-
* suffixed.
16+
* @property {string} type The type of inline edit we are currently on.
17+
* @property {string} what The type property with a hash prefixed and a dash suffixed.
1918
*
20-
* @param {JQueryStatic} $ The jQuery object.
21-
* @param {Object} wp The WordPress object.
19+
* @param {JQueryStatic} $ The jQuery object.
20+
* @param {Object} wp The WordPress object.
2221
*/
2322
( function( $, wp ) {
2423

@@ -117,7 +116,7 @@ window.inlineEditTax = {
117116
*
118117
* @param {string|HTMLElement} id The ID of the term we want to quick edit or an
119118
* element within the table row or the
120-
* table row itself.
119+
* table row itself.
121120
* @return {boolean} Always returns false.
122121
*/
123122
edit : function(id) {
@@ -164,7 +163,7 @@ window.inlineEditTax = {
164163
*
165164
* @param {string|HTMLElement} id The ID of the term we want to quick edit or an
166165
* element within the table row or the
167-
* table row itself.
166+
* table row itself.
168167
* @return {boolean} Always returns false.
169168
*/
170169
save : function(id) {

‎src/js/_enqueues/admin/media.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @memberOf findPosts
2525
*
2626
* @param {string} af_name The name of the affected element.
27-
* @param {string} af_val The value of the affected post element.
27+
* @param {string} af_val The value of the affected post element.
2828
*
2929
* @return {boolean} Always returns false.
3030
*/

‎src/js/_enqueues/admin/postbox.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -246,10 +246,10 @@
246246
*
247247
* @memberof postboxes
248248
*
249-
* @param {string} page The page we are currently on.
250-
* @param {Object} [args]
251-
* @param {Function} args.pbshow A callback that is called when a postbox opens.
252-
* @param {Function} args.pbhide A callback that is called when a postbox closes.
249+
* @param {string} page The page we are currently on.
250+
* @param {Object} [args] Optional arguments for the postbox toggles.
251+
* @param {Function} [args.pbshow] A callback that is called when a postbox opens.
252+
* @param {Function} [args.pbhide] A callback that is called when a postbox closes.
253253
* @return {void}
254254
*/
255255
add_postbox_toggles : function (page, args) {
@@ -353,8 +353,8 @@
353353
*
354354
* @memberof postboxes
355355
*
356-
* @param {string} page The page we are currently on.
357-
* @param {Object} [args={}] The arguments for the postbox initializer.
356+
* @param {string} page The page we are currently on.
357+
* @param {Object} [args={}] The arguments for the postbox initializer.
358358
* @param {Function} args.pbshow A callback that is called when a postbox opens.
359359
* @param {Function} args.pbhide A callback that is called when a postbox
360360
* closes.

0 commit comments

Comments
 (0)