Merge branch 'trunk' into trunk

Author: racmanuel

assets/src/js/_acf-condition-types.js

@@ -71,7 +71,7 @@
 		const template = function ( selection ) {
 			return (
 				`<span class="acf-${ typeAttr }-select-name acf-conditional-select-name">` +
-				acf.escHtml( selection.text ) +
+				acf.strEscape( selection.text ) +
 				'</span>'
 			);
 		};
@@ -84,7 +84,7 @@
 				'<span class="' +
 				classes +
 				'">' +
-				acf.escHtml( results.text ) +
+				acf.strEscape( results.text ) +
 				'</span>' +
 				`<span class="acf-${ typeAttr }-select-id acf-conditional-select-id">` +
 				( results.id ? results.id : '' ) +
@@ -558,16 +558,14 @@
 		type: 'hasPostObject',
 		operator: '==',
 		label: __( 'Post is equal to' ),
-		fieldTypes: [
-			'post_object',
-		],
+		fieldTypes: [ 'post_object' ],
 		match: function ( rule, field ) {
 			return isEqualToNumber( rule.value, field.val() );
 		},
 		choices: function ( fieldObject ) {
 			return conditionalSelect2( fieldObject, 'post_object' );
 		},
-	});
+	} );
 
 	acf.registerConditionType( HasPostObject );
 
@@ -580,16 +578,14 @@
 		type: 'hasPostObjectNotEqual',
 		operator: '!==',
 		label: __( 'Post is not equal to' ),
-		fieldTypes: [
-			'post_object',
-		],
+		fieldTypes: [ 'post_object' ],
 		match: function ( rule, field ) {
 			return ! isEqualToNumber( rule.value, field.val() );
 		},
 		choices: function ( fieldObject ) {
 			return conditionalSelect2( fieldObject, 'post_object' );
 		},
-	});
+	} );
 
 	acf.registerConditionType( HasPostObjectNotEqual );
 
@@ -602,9 +598,7 @@
 		type: 'containsPostObject',
 		operator: '==contains',
 		label: __( 'Posts contain' ),
-		fieldTypes: [
-			'post_object',
-		],
+		fieldTypes: [ 'post_object' ],
 		match: function ( rule, field ) {
 			const val = field.val();
 			const ruleVal = rule.value;
@@ -620,7 +614,7 @@
 		choices: function ( fieldObject ) {
 			return conditionalSelect2( fieldObject, 'post_object' );
 		},
-	});
+	} );
 
 	acf.registerConditionType( containsPostObject );
 
@@ -633,16 +627,14 @@
 		type: 'containsNotPostObject',
 		operator: '!=contains',
 		label: __( 'Posts do not contain' ),
-		fieldTypes: [
-			'post_object',
-		],
+		fieldTypes: [ 'post_object' ],
 		match: function ( rule, field ) {
 			const val = field.val();
 			const ruleVal = rule.value;
 
 			let match = true;
 			if ( val instanceof Array ) {
-				match = ! val.includes( ruleVal );	
+				match = ! val.includes( ruleVal );
 			} else {
 				match = val !== ruleVal;
 			}
@@ -651,7 +643,7 @@
 		choices: function ( fieldObject ) {
 			return conditionalSelect2( fieldObject, 'post_object' );
 		},
-	});
+	} );
 
 	acf.registerConditionType( containsNotPostObject );
 
@@ -664,20 +656,18 @@
 		type: 'hasAnyPostObject',
 		operator: '!=empty',
 		label: __( 'Has any post selected' ),
-		fieldTypes: [
-			'post_object',
-		],
+		fieldTypes: [ 'post_object' ],
 		match: function ( rule, field ) {
 			let val = field.val();
 			if ( val instanceof Array ) {
 				val = val.length;
 			}
-			return !!val;
+			return !! val;
 		},
 		choices: function () {
 			return '<input type="text" disabled />';
 		},
-	});
+	} );
 
 	acf.registerConditionType( HasAnyPostObject );
 
@@ -690,20 +680,18 @@
 		type: 'hasNoPostObject',
 		operator: '==empty',
 		label: __( 'Has no post selected' ),
-		fieldTypes: [
-			'post_object',
-		],
+		fieldTypes: [ 'post_object' ],
 		match: function ( rule, field ) {
 			let val = field.val();
 			if ( val instanceof Array ) {
 				val = val.length;
 			}
-			return !val;
+			return ! val;
 		},
 		choices: function () {
 			return '<input type="text" disabled />';
 		},
-	});
+	} );
 
 	acf.registerConditionType( HasNoPostObject );
 

assets/src/js/_acf-screen.js

@@ -298,36 +298,23 @@
 
 				// Create postbox if doesn't exist.
 				if ( ! postbox ) {
-					var wpMinorVersion = parseFloat( acf.get( 'wp_version' ) );
-					if ( wpMinorVersion >= 5.5 ) {
-						var postboxHeader = [
-							'<div class="postbox-header">',
-							'<h2 class="hndle ui-sortable-handle">',
-							'<span>' + acf.escHtml( result.title ) + '</span>',
-							'</h2>',
-							'<div class="handle-actions hide-if-no-js">',
-							'<button type="button" class="handlediv" aria-expanded="true">',
-							'<span class="screen-reader-text">Toggle panel: ' +
-								acf.escHtml( result.title ) +
-								'</span>',
-							'<span class="toggle-indicator" aria-hidden="true"></span>',
-							'</button>',
-							'</div>',
-							'</div>',
-						].join( '' );
-					} else {
-						var postboxHeader = [
-							'<button type="button" class="handlediv" aria-expanded="true">',
-							'<span class="screen-reader-text">Toggle panel: ' +
-								acf.escHtml( result.title ) +
-								'</span>',
-							'<span class="toggle-indicator" aria-hidden="true"></span>',
-							'</button>',
-							'<h2 class="hndle ui-sortable-handle">',
-							'<span>' + acf.escHtml( result.title ) + '</span>',
-							'</h2>',
-						].join( '' );
-					}
+					var postboxHeader = [
+						'<div class="postbox-header">',
+						'<h2 class="hndle ui-sortable-handle">',
+						'<span>' + result.title + '</span>',
+						'</h2>',
+						'<div class="handle-actions hide-if-no-js">',
+						'<button type="button" class="handlediv" aria-expanded="true">',
+						'<span class="screen-reader-text">' +
+							acf.__( 'Toggle panel' ) +
+							': ' +
+							result.title +
+							'</span>',
+						'<span class="toggle-indicator" aria-hidden="true"></span>',
+						'</button>',
+						'</div>',
+						'</div>',
+					].join( '' );
 
 					// Ensure result.classes is set.
 					if ( ! result.classes ) result.classes = '';
@@ -515,13 +502,7 @@
 			acf.unload.disable();
 
 			// Refresh metaboxes since WP 5.3.
-			var wpMinorVersion = parseFloat( acf.get( 'wp_version' ) );
-			if ( wpMinorVersion >= 5.3 ) {
-				this.addAction(
-					'refresh_post_screen',
-					this.onRefreshPostScreen
-				);
-			}
+			this.addAction( 'refresh_post_screen', this.onRefreshPostScreen );
 
 			// Trigger "refresh" after WP has moved metaboxes into place.
 			wp.domReady( acf.refresh );
@@ -532,11 +513,11 @@
 			var attributes = [ 'template', 'parent', 'format' ];
 
 			// Append taxonomy attribute names to this list.
-			( wp.data.select( 'core' ).getTaxonomies() || [] ).map( function (
-				taxonomy
-			) {
-				attributes.push( taxonomy.rest_base );
-			} );
+			( wp.data.select( 'core' ).getTaxonomies() || [] ).map(
+				function ( taxonomy ) {
+					attributes.push( taxonomy.rest_base );
+				}
+			);
 
 			// Get relevant current post edits.
 			var _postEdits = wp.data.select( 'core/editor' ).getPostEdits();
@@ -614,17 +595,15 @@
 		 * @return	void
 		 */
 		onRefreshPostScreen: function ( data ) {
-
 			// Extract vars.
 			var select = wp.data.select( 'core/edit-post' );
 			var dispatch = wp.data.dispatch( 'core/edit-post' );
 
 			// Load current metabox locations and data.
 			var locations = {};
 			select.getActiveMetaBoxLocations().map( function ( location ) {
-				locations[ location ] = select.getMetaBoxesPerLocation(
-					location
-				);
+				locations[ location ] =
+					select.getMetaBoxesPerLocation( location );
 			} );
 
 			// Generate flat array of existing ids.