Ticket #40808: 40808.2.diff

Gruntfile.js

@@ -329 +329 @@
                                 expand: true,
                                 cwd: SOURCE_DIR,
                                 src: [
-                                        'wp-admin/js/*.js',
+                                        'wp-admin/js/**/*.js',
                                         'wp-includes/js/*.js',
                                         // Built scripts.
                                         '!wp-includes/js/media-*',

src/wp-admin/js/widgets/media-video-widget.js

@@ -135 +135 @@
                 },
 
                 /**
+                 * Whether a url is a supported external host.
+                 *
+                 * @param {String} url - Video url.
+                 * @returns {boolean} Whether url is a supported video host.
+                 */
+                isHostedVideo: function isHostedVideo( url ) {
+                        var parsedUrl = document.createElement( 'a' );
+                        parsedUrl.href = url;
+                        return /vimeo|youtu\.?be/.test( parsedUrl.host );
+                },
+
+                /**
                  * Render preview.
                  *
                  * @returns {void}
@@ -150 +162 @@
                         }
 
                         if ( ! attachmentId && attachmentUrl ) {
-                                parsedUrl = document.createElement( 'a' );
-                                parsedUrl.href = attachmentUrl;
-                                isHostedEmbed = /vimeo|youtu\.?be/.test( parsedUrl.host );
+                                isHostedEmbed = control.isHostedVideo( attachmentUrl );
                         }
 
                         if ( isHostedEmbed ) {

tests/qunit/wp-admin/js/widgets/test-media-video-widget.js

@@ -32 +32 @@
                 equal( mappedProps.title, undefined, 'mapMediaToModelProps should ignore title inputs' );
                 equal( mappedProps.loop, false, 'mapMediaToModelProps should set loop' );
                 equal( mappedProps.preload, 'meta', 'mapMediaToModelProps should set preload' );
+
+                // Test isHostedVideo().
+                equal( videoWidgetControlInstance.isHostedVideo( 'https://www.youtube.com/watch?v=OQSNhk5ICTI'), true, 'isHostedVideo should return true for full YouTube url.' );
+                equal( videoWidgetControlInstance.isHostedVideo( 'https://youtu.be/OQSNhk5ICTI' ), true, 'isHostedVideo should return true for shortened youtube url' );
+                equal( videoWidgetControlInstance.isHostedVideo( 'https://vimeo.com/190372437' ), true, 'isHostedVideo should return true for vimeo url.' );
+                equal( videoWidgetControlInstance.isHostedVideo( 'https://wordpress.org/' ), false, 'isHostedVideo should return false for non-supported video url.' );
         });
 
         test( 'video widget control renderPreview', function( assert ) {