diff --git package-lock.json package-lock.json
index c09426b894..444d08baf5 100644
|
|
|
4314 | 4314 | "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==" |
4315 | 4315 | }, |
4316 | 4316 | "backbone": { |
4317 | | "version": "1.3.3", |
4318 | | "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.3.3.tgz", |
4319 | | "integrity": "sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk=", |
| 4317 | "version": "1.4.0", |
| 4318 | "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.4.0.tgz", |
| 4319 | "integrity": "sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==", |
4320 | 4320 | "requires": { |
4321 | 4321 | "underscore": ">=1.8.3" |
4322 | 4322 | } |
diff --git package.json package.json
index 4bf1a8435c..71a8b5e185 100644
|
|
|
101 | 101 | "@wordpress/url": "2.5.0", |
102 | 102 | "@wordpress/viewport": "2.3.0", |
103 | 103 | "@wordpress/wordcount": "2.2.0", |
104 | | "backbone": "1.3.3", |
| 104 | "backbone": "1.4.0", |
105 | 105 | "clipboard": "2.0.4", |
106 | 106 | "element-closest": "^2.0.2", |
107 | 107 | "formdata-polyfill": "3.0.13", |
diff --git src/js/media/controllers/state-machine.js src/js/media/controllers/state-machine.js
index 626f6c33ce..bb7fb31b27 100644
|
|
|
14 | 14 | * @augments Backbone.Model |
15 | 15 | * @mixin |
16 | 16 | * @mixes Backbone.Events |
17 | | * |
18 | | * @param {Array} states |
19 | 17 | */ |
20 | | var StateMachine = function( states ) { |
21 | | // @todo This is dead code. The states collection gets created in media.view.Frame._createStates. |
22 | | this.states = new Backbone.Collection( states ); |
| 18 | var StateMachine = function() { |
| 19 | return { |
| 20 | // Use Backbone's self-propagating `extend` inheritance method. |
| 21 | extend: Backbone.Model.extend |
| 22 | }; |
23 | 23 | }; |
24 | 24 | |
25 | | // Use Backbone's self-propagating `extend` inheritance method. |
26 | | StateMachine.extend = Backbone.Model.extend; |
27 | | |
28 | 25 | _.extend( StateMachine.prototype, Backbone.Events,/** @lends wp.media.controller.StateMachine.prototype */{ |
29 | 26 | /** |
30 | 27 | * Fetch a state. |
diff --git src/js/media/views/attachment.js src/js/media/views/attachment.js
index 240f05c0ee..14d5e460db 100644
|
|
Attachment = View.extend(/** @lends wp.media.view.Attachment.prototype */{ |
66 | 66 | this.details( this.model, this.controller.state().get('selection') ); |
67 | 67 | } |
68 | 68 | |
69 | | this.listenTo( this.controller, 'attachment:compat:waiting attachment:compat:ready', this.updateSave ); |
| 69 | this.listenTo( this.controller.states, 'attachment:compat:waiting attachment:compat:ready', this.updateSave ); |
70 | 70 | }, |
71 | 71 | /** |
72 | 72 | * @returns {wp.media.view.Attachment} Returns itself to allow chaining |
diff --git src/js/media/views/media-details.js src/js/media/views/media-details.js
index 4b9a7c1a0d..ae643a3941 100644
|
|
MediaDetails = AttachmentDisplay.extend(/** @lends wp.media.view.MediaDetails.pr |
19 | 19 | initialize: function() { |
20 | 20 | _.bindAll(this, 'success'); |
21 | 21 | this.players = []; |
22 | | this.listenTo( this.controller, 'close', wp.media.mixin.unsetPlayers ); |
| 22 | this.listenTo( this.controller.states, 'close', wp.media.mixin.unsetPlayers ); |
23 | 23 | this.on( 'ready', this.setPlayer ); |
24 | 24 | this.on( 'media:setting:remove', wp.media.mixin.unsetPlayers, this ); |
25 | 25 | this.on( 'media:setting:remove', this.render ); |
diff --git src/wp-includes/class-wp-user-query.php src/wp-includes/class-wp-user-query.php
index cde7811c88..64776e10e8 100644
|
|
class WP_User_Query { |
159 | 159 | * @type string $search Search keyword. Searches for possible string matches on columns. |
160 | 160 | * When `$search_columns` is left empty, it tries to determine which |
161 | 161 | * column to search in based on search string. Default empty. |
162 | | * @type array $search_columns Array of column names to be searched. Accepts 'ID', 'user_login', |
163 | | * 'user_email', 'user_url', 'user_nicename', 'display_name'. |
164 | | * Default empty array. |
| 162 | * @type array $search_columns Array of column names to be searched. Accepts 'ID', 'login', |
| 163 | * 'nicename', 'email', 'url'. Default empty array. |
165 | 164 | * @type string|array $orderby Field(s) to sort the retrieved users by. May be a single value, |
166 | 165 | * an array of values, or a multi-dimensional array with fields as |
167 | 166 | * keys and orders ('ASC' or 'DESC') as values. Accepted values are |
… |
… |
class WP_User_Query { |
538 | 537 | /** |
539 | 538 | * Filters the columns to search in a WP_User_Query search. |
540 | 539 | * |
541 | | * The default columns depend on the search term, and include 'ID', 'user_login', |
542 | | * 'user_email', 'user_url', 'user_nicename', and 'display_name'. |
| 540 | * The default columns depend on the search term, and include 'user_email', |
| 541 | * 'user_login', 'ID', 'user_url', 'display_name', and 'user_nicename'. |
543 | 542 | * |
544 | 543 | * @since 3.6.0 |
545 | 544 | * |
diff --git src/wp-includes/script-loader.php src/wp-includes/script-loader.php
index 5366bfbcd0..eeb76639a7 100644
|
|
function wp_default_scripts( &$scripts ) { |
1170 | 1170 | did_action( 'init' ) && $scripts->add_data( 'json2', 'conditional', 'lt IE 8' ); |
1171 | 1171 | |
1172 | 1172 | $scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.8.3', 1 ); |
1173 | | $scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore', 'jquery' ), '1.2.3', 1 ); |
| 1173 | $scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore', 'jquery' ), '1.4.0', 1 ); |
1174 | 1174 | |
1175 | 1175 | $scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array( 'underscore', 'jquery' ), false, 1 ); |
1176 | 1176 | did_action( 'init' ) && $scripts->localize( |