WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Coding Standards: Add missing braces to `if` conditions in `js/_enqueues/wp/customize/base.js`. 

Props ankitmaru.
Fixes #49122.
Built from https://develop.svn.wordpress.org/trunk@47038


git-svn-id: http://core.svn.wordpress.org/trunk@46838 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-01-04 01:28:05 +00:00
parent 08f53ef906
commit 7ad56f1237
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
wp-includes/js/customize-base.js
View File

@ -51,12 +51,14 @@ window.wp = window.wp || {};
// Add prototype properties (instance properties) to the subclass, // Add prototype properties (instance properties) to the subclass,
// if supplied. // if supplied.
if ( protoProps ) if ( protoProps ) {
$.extend( child.prototype, protoProps ); $.extend( child.prototype, protoProps );
}
// Add static properties to the constructor function, if supplied. // Add static properties to the constructor function, if supplied.
if ( staticProps ) if ( staticProps ) {
$.extend( child, staticProps ); $.extend( child, staticProps );
}
// Correctly set child's `prototype.constructor`. // Correctly set child's `prototype.constructor`.
child.prototype.constructor = child; child.prototype.constructor = child;
@ -132,10 +134,12 @@ window.wp = window.wp || {};
var proto = this; var proto = this;
while ( typeof proto.constructor !== 'undefined' ) { while ( typeof proto.constructor !== 'undefined' ) {
if ( proto.constructor === constructor ) if ( proto.constructor === constructor ) {
return true; return true;
if ( typeof proto.constructor.__super__ === 'undefined' ) }
if ( typeof proto.constructor.__super__ === 'undefined' ) {
return false; return false;
}
proto = proto.constructor.__super__; proto = proto.constructor.__super__;
} }
return false; return false;
@ -148,8 +152,9 @@ window.wp = window.wp || {};
*/ */
api.Events = { api.Events = {
trigger: function( id ) { trigger: function( id ) {
if ( this.topics && this.topics[ id ] ) if ( this.topics && this.topics[ id ] ) {
this.topics[ id ].fireWith( this, slice.call( arguments, 1 ) ); this.topics[ id ].fireWith( this, slice.call( arguments, 1 ) );
}
return this; return this;
}, },
@ -161,8 +166,9 @@ window.wp = window.wp || {};
}, },
unbind: function( id ) { unbind: function( id ) {
if ( this.topics && this.topics[ id ] ) if ( this.topics && this.topics[ id ] ) {
this.topics[ id ].remove.apply( this.topics[ id ], slice.call( arguments, 1 ) ); this.topics[ id ].remove.apply( this.topics[ id ], slice.call( arguments, 1 ) );
}
return this; return this;
} }
}; };
@ -351,8 +357,9 @@ window.wp = window.wp || {};
* A Deferred Promise object if a callback function is supplied. * A Deferred Promise object if a callback function is supplied.
*/ */
instance: function( id ) { instance: function( id ) {
if ( arguments.length === 1 ) if ( arguments.length === 1 ) {
return this.value( id ); return this.value( id );
}
return this.when.apply( this, arguments ); return this.when.apply( this, arguments );
}, },
@ -490,16 +497,18 @@ window.wp = window.wp || {};
dfd = $.Deferred(); dfd = $.Deferred();
// If the last argument is a callback, bind it to .done() // If the last argument is a callback, bind it to .done()
if ( $.isFunction( ids[ ids.length - 1 ] ) ) if ( $.isFunction( ids[ ids.length - 1 ] ) ) {
dfd.done( ids.pop() ); dfd.done( ids.pop() );
}
/* /*
* Create a stack of deferred objects for each item that is not * Create a stack of deferred objects for each item that is not
* yet available, and invoke the supplied callback when they are. * yet available, and invoke the supplied callback when they are.
*/ */
$.when.apply( $, $.map( ids, function( id ) { $.when.apply( $, $.map( ids, function( id ) {
if ( self.has( id ) ) if ( self.has( id ) ) {
return; return;
}
/* /*
* The requested item is not available yet, create a deferred * The requested item is not available yet, create a deferred
@ -546,7 +555,7 @@ window.wp = window.wp || {};
* @param {string|jQuery collection} element * @param {string|jQuery collection} element
*/ */
api.ensure = function( element ) { api.ensure = function( element ) {
return typeof element == 'string' ? $( element ) : element; return typeof element === 'string' ? $( element ) : element;
}; };
/** /**
@ -744,10 +753,11 @@ window.wp = window.wp || {};
} }
// Check to make sure the origin is valid. // Check to make sure the origin is valid.
if ( this.origin() && event.origin !== this.origin() ) if ( this.origin() && event.origin !== this.origin() ) {
return; return;
}
// Ensure we have a string that's JSON.parse-able // Ensure we have a string that's JSON.parse-able.
if ( typeof event.data !== 'string' || event.data[0] !== '{' ) { if ( typeof event.data !== 'string' || event.data[0] !== '{' ) {
return; return;
} }
@ -755,12 +765,14 @@ window.wp = window.wp || {};
message = JSON.parse( event.data ); message = JSON.parse( event.data );
// Check required message properties. // Check required message properties.
if ( ! message || ! message.id || typeof message.data === 'undefined' ) if ( ! message || ! message.id || typeof message.data === 'undefined' ) {
return; return;
}
// Check if channel names match. // Check if channel names match.
if ( ( message.channel || this.channel() ) && this.channel() !== message.channel ) if ( ( message.channel || this.channel() ) && this.channel() !== message.channel ) {
return; return;
}
this.trigger( message.id, message.data ); this.trigger( message.id, message.data );
}, },
@ -776,12 +788,14 @@ window.wp = window.wp || {};
data = typeof data === 'undefined' ? null : data; data = typeof data === 'undefined' ? null : data;
if ( ! this.url() || ! this.targetWindow() ) if ( ! this.url() || ! this.targetWindow() ) {
return; return;
}
message = { id: id, data: data }; message = { id: id, data: data };
if ( this.channel() ) if ( this.channel() ) {
message.channel = this.channel(); message.channel = this.channel();
}
this.targetWindow().postMessage( JSON.stringify( message ), this.origin() ); this.targetWindow().postMessage( JSON.stringify( message ), this.origin() );
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-alpha-47037'; $wp_version = '5.4-alpha-47038';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.