Changeset 31045

Timestamp:

01/04/2015 05:24:24 AM (10 years ago)

Author:

wonderboymusic

Message:

In Media Views, use this.listenTo( this.model, .... ) instead of this.model.on( .... ) to fix garbage collection and to avoid "ghost views."

Fixes #30896.

File:

• trunk/src/wp-includes/js/media-views.js (modified) (9 diffs)

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

@@ -4660 +4660 @@
             }, this );
 
-            this.model.on( 'change', this.render, this );
+            this.listenTo( this.model, 'change', this.render );
         },
         /**
@@ -5119 +5119 @@
 
             if ( options.rerenderOnModelChange ) {
-                this.model.on( 'change', this.render, this );
+                this.listenTo( this.model, 'change', this.render );
             } else {
-                this.model.on( 'change:percent', this.progress, this );
-            }
-            this.model.on( 'change:title', this._syncTitle, this );
-            this.model.on( 'change:caption', this._syncCaption, this );
-            this.model.on( 'change:artist', this._syncArtist, this );
-            this.model.on( 'change:album', this._syncAlbum, this );
+                this.listenTo( this.model, 'change:percent', this.progress );
+            }
+            this.listenTo( this.model, 'change:title', this._syncTitle );
+            this.listenTo( this.model, 'change:caption', this._syncCaption );
+            this.listenTo( this.model, 'change:artist', this._syncArtist );
+            this.listenTo( this.model, 'change:album', this._syncAlbum );
 
             // Update the selection.
-            this.model.on( 'add', this.select, this );
-            this.model.on( 'remove', this.deselect, this );
+            this.listenTo( this.model, 'add', this.select );
+            this.listenTo( this.model, 'remove', this.deselect );
             if ( selection ) {
                 selection.on( 'reset', this.updateSelect, this );
                 // Update the model's details view.
-                this.model.on( 'selection:single selection:unsingle', this.details, this );
+                this.listenTo( this.model, 'selection:single selection:unsingle', this.details );
                 this.details( this.model, this.controller.state().get('selection') );
             }
@@ -6016 +6016 @@
             }, this ).sortBy('priority').pluck('el').value() );
 
-            this.model.on( 'change', this.select, this );
+            this.listenTo( this.model, 'change', this.select );
             this.select();
         },
@@ -6819 +6819 @@
         initialize: function() {
             this.model = this.model || new Backbone.Model();
-            this.model.on( 'change', this.updateChanges, this );
+            this.listenTo( this.model, 'change', this.updateChanges );
         },
 
@@ -6936 +6936 @@
             // Call 'initialize' directly on the parent class.
             media.view.Settings.prototype.initialize.apply( this, arguments );
-            this.model.on( 'change:link', this.updateLinkTo, this );
+            this.listenTo( this.model, 'change:link', this.updateLinkTo );
 
             if ( attachment ) {
@@ -7186 +7186 @@
 
         initialize: function() {
-            this.model.on( 'change:compat', this.render, this );
+            this.listenTo( this.model, 'change:compat', this.render );
         },
         /**
@@ -7286 +7286 @@
             this.views.set([ this.url ]);
             this.refresh();
-            this.model.on( 'change:type', this.refresh, this );
-            this.model.on( 'change:loading', this.loading, this );
+            this.listenTo( this.model, 'change:type', this.refresh );
+            this.listenTo( this.model, 'change:loading', this.loading );
         },
 
@@ -7373 +7373 @@
             this.$el.append([ this.input, this.spinner ]);
 
-            this.model.on( 'change:url', this.render, this );
+            this.listenTo( this.model, 'change:url', this.render );
 
             if ( this.model.get( 'url' ) ) {
@@ -7499 +7499 @@
              */
             media.view.Settings.AttachmentDisplay.prototype.initialize.apply( this, arguments );
-            this.model.on( 'change:url', this.updateImage, this );
+            this.listenTo( this.model, 'change:url', this.updateImage );
         },