Ticket #22740: 22740.2.diff

wp-includes/js/media-views.js

@@ -786 +786 @@
                 },
 
                 reset: function() {
-                        this.props = new Backbone.Model({ url: '' });
+                        this.props.clear().set({ url: '' });
 
                         if ( this.active )
                                 this.refresh();
@@ -2422 +2422 @@
 
                 refresh: function() {
                         var url = this.controller.state().props.get('url');
-                        this.get('select').model.set( 'disabled', ! url || /^https?:\/\/$/.test(url) );
+                        this.get('select').model.set( 'disabled', ! url || url === 'http://' );
 
                         media.view.Toolbar.Select.prototype.refresh.apply( this, arguments );
                 }
@@ -3772 +3772 @@
                         this.model.on( 'change', this.updateChanges, this );
                 },
 
-                render: function() {
-                        this.$el.html( this.template( _.defaults({
+                prepare: function() {
+                        return _.defaults({
                                 model: this.model.toJSON()
-                        }, this.options ) ) );
+                        }, this.options );
+                },
 
+                render: function() {
+                        media.View.prototype.render.apply( this, arguments );
                         // Select the correct values.
                         _( this.model.attributes ).chain().keys().each( this.update, this );
                         return this;
@@ -4026 +4029 @@
                                 model:      this.model.props
                         }).render();
 
-                        this._settings = new media.View();
+                        this.views.set([ this.url ]);
                         this.refresh();
                         this.model.on( 'change:type', this.refresh, this );
                 },
 
-                render: function() {
-                        this.$el.html([ this.url.el, this._settings.el ]);
-                        this.url.focus();
-                        this.views.render();
-                        return this;
-                },
-
                 settings: function( view ) {
-                        view.render();
-                        this._settings.$el.replaceWith( view.$el );
-                        this._settings.remove();
+                        if ( this._settings )
+                                this._settings.remove();
                         this._settings = view;
+                        this.views.add( view );
                 },
 
                 refresh: function() {
@@ -4096 +4092 @@
                                 return;
 
                         this.input.value = this.model.get('url') || 'http://';
+                        media.View.prototype.render.apply( this, arguments );
                         return this;
                 },
 
+                ready: function() {
+                        this.focus();
+                },
+
                 url: function( event ) {
                         this.model.set( 'url', event.target.value );
                 },