Changeset 40076

Timestamp:

02/17/2017 09:59:37 PM (9 years ago)

Author:

adamsilverstein

Message:

JavaScript: when starting Backbone history, stop if previously started.

Prevent a potential error condition if Backbone history is started by a plugin or theme before core tries to start it.

Props tfrommen.
Fixes #39612.

Location:

trunk/src

Files:

• wp-admin/js/revisions.js (modified) (1 diff)
• wp-admin/js/theme.js (modified) (2 diffs)
• wp-includes/js/media-grid.js (modified) (1 diff)
• wp-includes/js/media/views/frame/manage.js (modified) (1 diff)

trunk/src/wp-admin/js/revisions.js

@@ -412 +412 @@
                         if ( window.history && window.history.pushState ) {
                                 this.router = new revisions.Router({ model: this });
+                                if ( Backbone.History.started ) {
+                                        Backbone.history.stop();
+                                }
                                 Backbone.history.start({ pushState: true });
                         }

trunk/src/wp-admin/js/theme.js

@@ -1432 +1432 @@
                 this.routes();
 
+                if ( Backbone.History.started ) {
+                        Backbone.history.stop();
+                }
                 Backbone.history.start({
                         root: themes.data.settings.adminUrl,
@@ -1885 +1888 @@
                 this.routes();
 
+                if ( Backbone.History.started ) {
+                        Backbone.history.stop();
+                }
                 Backbone.history.start({
                         root: themes.data.settings.adminUrl,

trunk/src/wp-includes/js/media-grid.js

@@ -845 +845 @@
                 // Verify pushState support and activate
                 if ( window.history && window.history.pushState ) {
+                        if ( Backbone.History.started ) {
+                                Backbone.history.stop();
+                        }
                         Backbone.history.start( {
                                 root: window._wpMediaGridSettings.adminUrl,

trunk/src/wp-includes/js/media/views/frame/manage.js

@@ -260 +260 @@
                 // Verify pushState support and activate
                 if ( window.history && window.history.pushState ) {
+                        if ( Backbone.History.started ) {
+                                Backbone.history.stop();
+                        }
                         Backbone.history.start( {
                                 root: window._wpMediaGridSettings.adminUrl,