Changeset 46157

Timestamp:

09/17/2019 05:18:32 PM (5 years ago)

Author:

adamsilverstein

Message:

External Libraries: Update Backbone.js to 1.4.0.

Upgrade Backbone to the latest stable version. Fix some issues in Media with listenTo which changed in this version, see ​https://backbonejs.org/#changelog.

Props desrosj, priyankkpatel, pierlo.
Fixes #47478.

Location:

trunk

Files:

• package-lock.json (modified) (1 diff)
• package.json (modified) (1 diff)
• src/js/media/controllers/state-machine.js (modified) (1 diff)
• src/js/media/views/attachment.js (modified) (1 diff)
• src/js/media/views/media-details.js (modified) (1 diff)
• src/wp-includes/script-loader.php (modified) (1 diff)

trunk/package-lock.json

@@ -4315 +4315 @@
         },
         "backbone": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.3.3.tgz",
-            "integrity": "sha1-TMgOp8sWMaxHSInOQPL4vGg7KZk=",
+            "version": "1.4.0",
+            "resolved": "https://registry.npmjs.org/backbone/-/backbone-1.4.0.tgz",
+            "integrity": "sha512-RLmDrRXkVdouTg38jcgHhyQ/2zjg7a8E6sz2zxfz21Hh17xDJYUHBZimVIt5fUyS8vbfpeSmTL3gUjTEvUV3qQ==",
             "requires": {
                 "underscore": ">=1.8.3"

trunk/package.json

@@ -102 +102 @@
         "@wordpress/viewport": "2.3.0",
         "@wordpress/wordcount": "2.2.0",
-        "backbone": "1.3.3",
+        "backbone": "1.4.0",
         "clipboard": "2.0.4",
         "element-closest": "^2.0.2",

trunk/src/js/media/controllers/state-machine.js

@@ -15 +15 @@
  * @mixin
  * @mixes Backbone.Events
- *
- * @param {Array} states
  */
-var StateMachine = function( states ) {
-    // @todo This is dead code. The states collection gets created in media.view.Frame._createStates.
-    this.states = new Backbone.Collection( states );
+var StateMachine = function() {
+    return {
+        // Use Backbone's self-propagating `extend` inheritance method.
+        extend: Backbone.Model.extend
+    };
 };
-
-// Use Backbone's self-propagating `extend` inheritance method.
-StateMachine.extend = Backbone.Model.extend;
 
 _.extend( StateMachine.prototype, Backbone.Events,/** @lends wp.media.controller.StateMachine.prototype */{

trunk/src/js/media/views/attachment.js

@@ -67 +67 @@
         }
 
-        this.listenTo( this.controller, 'attachment:compat:waiting attachment:compat:ready', this.updateSave );
+        this.listenTo( this.controller.states, 'attachment:compat:waiting attachment:compat:ready', this.updateSave );
     },
     /**

trunk/src/js/media/views/media-details.js

@@ -20 +20 @@
         _.bindAll(this, 'success');
         this.players = [];
-        this.listenTo( this.controller, 'close', wp.media.mixin.unsetPlayers );
+        this.listenTo( this.controller.states, 'close', wp.media.mixin.unsetPlayers );
         this.on( 'ready', this.setPlayer );
         this.on( 'media:setting:remove', wp.media.mixin.unsetPlayers, this );

trunk/src/wp-includes/script-loader.php

@@ -1171 +1171 @@
 
     $scripts->add( 'underscore', "/wp-includes/js/underscore$dev_suffix.js", array(), '1.8.3', 1 );
-    $scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore', 'jquery' ), '1.2.3', 1 );
+    $scripts->add( 'backbone', "/wp-includes/js/backbone$dev_suffix.js", array( 'underscore', 'jquery' ), '1.4.0', 1 );
 
     $scripts->add( 'wp-util', "/wp-includes/js/wp-util$suffix.js", array( 'underscore', 'jquery' ), false, 1 );