Changeset 23028

Timestamp:

12/04/2012 05:45:24 PM (13 years ago)

Author:

markjaquith

Message:

Update toolbars for Embed screen. Fixes JS error. props koopersmith. fixes #22714

File:

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

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

@@ -745 +745 @@
             this.props = new Backbone.Model({ url: '' });
             this.props.on( 'change:url', this.debouncedScan, this );
+            this.props.on( 'change:url', this.refresh, this );
             this.on( 'scan', this.scanImage, this );
         },
@@ -775 +776 @@
         },
 
+        refresh: function() {
+            this.frame.toolbar.get().refresh();
+        },
+
         reset: function() {
             this.props = new Backbone.Model({ url: '' });
 
-            if ( this.id === this.frame.state().id )
-                this.frame.toolbar.get().refresh();
+            if ( this.active )
+                this.refresh();
         }
     });
@@ -2209 +2214 @@
                 this.render();
 
-            selection.on( 'add remove reset', this.refresh, this );
-            library.on( 'add remove reset', this.refresh, this );
+            if ( selection )
+                selection.on( 'add remove reset', this.refresh, this );
+            if ( library )
+                library.on( 'add remove reset', this.refresh, this );
         },
 
         dispose: function() {
-            this.selection.off( null, null, this );
-            this.library.off( null, null, this );
+            if ( this.selection )
+                this.selection.off( null, null, this );
+            if ( this.library )
+                this.library.off( null, null, this );
             return media.View.prototype.dispose.apply( this, arguments );
         },
@@ -2279 +2288 @@
                     disabled = false;
 
-                if ( requires.selection && ! selection.length )
+                if ( requires.selection && selection && ! selection.length )
                     disabled = true;
-                else if ( requires.library && ! library.length )
+                else if ( requires.library && library && ! library.length )
                     disabled = true;
 
@@ -2348 +2357 @@
         initialize: function() {
             _.defaults( this.options, {
-                text: l10n.insertIntoPost
+                text: l10n.insertIntoPost,
+                requires: false
             });
 
             media.view.Toolbar.Select.prototype.initialize.apply( this, arguments );
-            this.controller.state().props.on( 'change:url', this.refresh, this );
-        },
-
-        dispose: function() {
-            this.controller.state().props.off( 'change:url', this.refresh, this );
-            media.view.Toolbar.Select.prototype.dispose.apply( this, arguments );
         },