WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

git-svn-id: http://core.svn.wordpress.org/trunk@23028 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Mark Jaquith 2012-12-04 17:45:24 +00:00
parent 28cba48236
commit 82d51aeeef
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wp-includes/js/media-views.js
View File

@ -744,6 +744,7 @@
this.debouncedScan = _.debounce( _.bind( this.scan, this ), this.sensitivity ); this.debouncedScan = _.debounce( _.bind( this.scan, this ), this.sensitivity );
this.props = new Backbone.Model({ url: '' }); this.props = new Backbone.Model({ url: '' });
this.props.on( 'change:url', this.debouncedScan, this ); this.props.on( 'change:url', this.debouncedScan, this );
this.props.on( 'change:url', this.refresh, this );
this.on( 'scan', this.scanImage, this ); this.on( 'scan', this.scanImage, this );
}, },
@ -774,11 +775,15 @@
image.src = url; image.src = url;
}, },
refresh: function() {
this.frame.toolbar.get().refresh();
},
reset: function() { reset: function() {
this.props = new Backbone.Model({ url: '' }); this.props = new Backbone.Model({ url: '' });
if ( this.id === this.frame.state().id ) if ( this.active )
this.frame.toolbar.get().refresh(); this.refresh();
} }
}); });
@ -2208,12 +2213,16 @@
if ( ! this.options.silent ) if ( ! this.options.silent )
this.render(); this.render();
if ( selection )
selection.on( 'add remove reset', this.refresh, this ); selection.on( 'add remove reset', this.refresh, this );
if ( library )
library.on( 'add remove reset', this.refresh, this ); library.on( 'add remove reset', this.refresh, this );
}, },
dispose: function() { dispose: function() {
if ( this.selection )
this.selection.off( null, null, this ); this.selection.off( null, null, this );
if ( this.library )
this.library.off( null, null, this ); this.library.off( null, null, this );
return media.View.prototype.dispose.apply( this, arguments ); return media.View.prototype.dispose.apply( this, arguments );
}, },
@ -2278,9 +2287,9 @@
var requires = button.options.requires, var requires = button.options.requires,
disabled = false; disabled = false;
if ( requires.selection && ! selection.length ) if ( requires.selection && selection && ! selection.length )
disabled = true; disabled = true;
else if ( requires.library && ! library.length ) else if ( requires.library && library && ! library.length )
disabled = true; disabled = true;
button.model.set( 'disabled', disabled ); button.model.set( 'disabled', disabled );
@ -2347,16 +2356,11 @@
media.view.Toolbar.Embed = media.view.Toolbar.Select.extend({ media.view.Toolbar.Embed = media.view.Toolbar.Select.extend({
initialize: function() { initialize: function() {
_.defaults( this.options, { _.defaults( this.options, {
text: l10n.insertIntoPost text: l10n.insertIntoPost,
requires: false
}); });
media.view.Toolbar.Select.prototype.initialize.apply( this, arguments ); 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 );
}, },
refresh: function() { refresh: function() {