Ticket #22726: 22726.3.diff

src/wp-includes/js/media/controllers/embed.js

@@ -13 +13 @@
  * @param {string} [attributes.content=embed]         Initial mode for the content region.
  * @param {string} [attributes.menu=default]          Initial mode for the menu region.
  * @param {string} [attributes.toolbar=main-embed]    Initial mode for the toolbar region.
- * @param {string} [attributes.menu=false]            Initial mode for the menu region.
  * @param {int}    [attributes.priority=120]          The priority for the state link in the media menu.
  * @param {string} [attributes.type=link]             The type of embed. Currently only link is supported.
  * @param {string} [attributes.url]                   The embed URL.
@@ -26 +25 @@
 Embed = wp.media.controller.State.extend({
         defaults: {
                 id:       'embed',
-                title:    l10n.insertFromUrlTitle,
+                title:    l10n.fromUrlTitle,
                 content:  'embed',
                 menu:     'default',
+                router:   'browse',
                 toolbar:  'main-embed',
                 priority: 120,
                 type:     'link',
@@ -46 +46 @@
                 this.props.on( 'change:url', this.debouncedScan, this );
                 this.props.on( 'change:url', this.refresh, this );
                 this.on( 'scan', this.scanImage, this );
+                this.off( 'ready', this._ready, this );
         },
 
         /**
@@ -100 +101 @@
                 image.onload = function() {
                         deferred.resolve();
 
-                        if ( state !== frame.state() || url !== state.props.get('url') ) {
+                        if ( url !== state.props.get('url') ) {
                                 return;
                         }
 

src/wp-includes/js/media/views/frame/post.js

@@ -174 +174 @@
         bindHandlers: function() {
                 var handlers, checkCounts;
 
+                this.on( 'content:create:browse', this._fixState, this );
+                this.on( 'content:render:upload', this._fixState, this );
+                this.on( 'content:render:embed', this._fixState, this );
+
                 Select.prototype.bindHandlers.apply( this, arguments );
 
                 this.on( 'activate', this.activate, this );
@@ -196 +200 @@
                 this.on( 'toolbar:create:main-video-playlist', this.createToolbar, this );
                 this.on( 'toolbar:create:featured-image', this.featuredImageToolbar, this );
                 this.on( 'toolbar:create:main-embed', this.mainEmbedToolbar, this );
+                this.on( 'router:render:browse', this.embedRouterItem, this );
 
                 handlers = {
                         menu: {
@@ -348 +353 @@
                 });
         },
 
+        embedRouterItem: function( routerView ) {
+                var state = this.state(),
+                    routerItem = routerView.get( 'embed' );
+
+                if ( 'embed' === state.id || 'insert' === state.id ) {
+                        if ( ! routerItem ) {
+                                routerView.set( 'embed', {
+                                        text: l10n.fromUrlTitle,
+                                        priority: 60
+                                });
+                        } else {
+                                routerView.show( 'embed' );
+                        }
+                } else {
+                        routerView.hide( 'embed' );
+                }
+        },
+
         // Content
+        _fixState: function() {
+                var mode = this.content.mode(),
+                    state = this.state().id;
+
+                if ( 'embed' === mode ) {
+                        this.setState( 'embed' );
+                } else if ( 'embed' === state ) {
+                        this.setState( 'insert' );
+                        this.content.mode( mode );
+                }
+        },
+
         embedContent: function() {
                 var view = new wp.media.view.Embed({
                         controller: this,

src/wp-includes/media.php

@@ -3091 +3091 @@
                 'attachmentDetails'  => __( 'Attachment Details' ),
 
                 // From URL
-                'insertFromUrlTitle' => __( 'Insert from URL' ),
+                'fromUrlTitle'       => __( 'From URL' ),
 
                 // Featured Images
                 'setFeaturedImageTitle' => $post_type_object->labels->featured_image,