Changeset 41179

Timestamp:

07/28/2017 02:35:56 AM (7 years ago)

Author:

westonruter

Message:

Media: Improve acceptance of YouTube /embed/ URLs when inserting in media modal.

Props timmydcrawford.
Fixes #41201.

Location:

trunk/src

Files:

• wp-admin/js/widgets/media-widgets.js (modified) (2 diffs)
• wp-includes/js/media-views.js (modified) (3 diffs)
• wp-includes/js/media/views/embed/link.js (modified) (2 diffs)

trunk/src/wp-admin/js/widgets/media-widgets.js

@@ -146 +146 @@
                      */
                     fetch: function() {
-                        var embedLinkView = this, fetchSuccess, matches, fileExt, urlParser; // eslint-disable-line consistent-this
+                        var embedLinkView = this, fetchSuccess, matches, fileExt, urlParser, url, re, youTubeEmbedMatch; // eslint-disable-line consistent-this
 
                         if ( embedLinkView.dfd && 'pending' === embedLinkView.dfd.state() ) {
@@ -191 +191 @@
                         }
 
+                        // Support YouTube embed links.
+                        url = embedLinkView.model.get( 'url' );
+                        re = /https?:\/\/www\.youtube\.com\/embed\/([^/]+)/;
+                        youTubeEmbedMatch = re.exec( url );
+                        if ( youTubeEmbedMatch ) {
+                            url = 'https://www.youtube.com/watch?v=' + youTubeEmbedMatch[ 1 ];
+                            // silently change url to proper oembed-able version.
+                            embedLinkView.model.attributes.url = url;
+                        }
+
                         embedLinkView.dfd = $.ajax({
                             url: wp.media.view.settings.oEmbedProxyUrl,
                             data: {
-                                url: embedLinkView.model.get( 'url' ),
+                                url: url,
                                 maxwidth: embedLinkView.model.get( 'width' ),
                                 maxheight: embedLinkView.model.get( 'height' ),

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

@@ -4625 +4625 @@
 
     fetch: function() {
+        var url = this.model.get( 'url' ), re, youTubeEmbedMatch;
 
         // check if they haven't typed in 500 ms
-        if ( $('#embed-url-field').val() !== this.model.get('url') ) {
+        if ( $('#embed-url-field').val() !== url ) {
             return;
         }
@@ -4633 +4634 @@
         if ( this.dfd && 'pending' === this.dfd.state() ) {
             this.dfd.abort();
+        }
+
+        // Support YouTube embed urls, since they work once in the editor.
+        re = /https?:\/\/www\.youtube\.com\/embed\/([^/]+)/;
+        youTubeEmbedMatch = re.exec( url );
+        if ( youTubeEmbedMatch ) {
+            url = 'https://www.youtube.com/watch?v=' + youTubeEmbedMatch[ 1 ];
         }
 
@@ -4638 +4646 @@
             url: wp.media.view.settings.oEmbedProxyUrl,
             data: {
-                url: this.model.get( 'url' ),
+                url: url,
                 maxwidth: this.model.get( 'width' ),
                 maxheight: this.model.get( 'height' ),

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

@@ -36 +36 @@
 
     fetch: function() {
+        var url = this.model.get( 'url' ), re, youTubeEmbedMatch;
 
         // check if they haven't typed in 500 ms
-        if ( $('#embed-url-field').val() !== this.model.get('url') ) {
+        if ( $('#embed-url-field').val() !== url ) {
             return;
         }
@@ -46 +47 @@
         }
 
+        // Support YouTube embed urls, since they work once in the editor.
+        re = /https?:\/\/www\.youtube\.com\/embed\/([^/]+)/;
+        youTubeEmbedMatch = re.exec( url );
+        if ( youTubeEmbedMatch ) {
+            url = 'https://www.youtube.com/watch?v=' + youTubeEmbedMatch[ 1 ];
+        }
+
         this.dfd = $.ajax({
             url: wp.media.view.settings.oEmbedProxyUrl,
             data: {
-                url: this.model.get( 'url' ),
+                url: url,
                 maxwidth: this.model.get( 'width' ),
                 maxheight: this.model.get( 'height' ),