Changeset 40810

Timestamp:

05/20/2017 04:17:33 AM (7 years ago)

Author:

westonruter

Message:

Widgets: Introduce isHostedVideo method on VideoWidgetControl to allow plugins to extend for recognizing services beyond YouTube and Vimeo.

Also update jshint configuration in Gruntfile to include the widget scripts among the JS files linted.

Props timmydcrawford.
See #39994.
Fixes #40808.

Location:

trunk

Files:

• Gruntfile.js (modified) (1 diff)
• src/wp-admin/js/widgets/media-video-widget.js (modified) (2 diffs)
• tests/qunit/wp-admin/js/widgets/test-media-video-widget.js (modified) (1 diff)

trunk/Gruntfile.js

@@ -330 +330 @@
                 cwd: SOURCE_DIR,
                 src: [
-                    'wp-admin/js/*.js',
+                    'wp-admin/js/**/*.js',
                     'wp-includes/js/*.js',
                     // Built scripts.

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

@@ -136 +136 @@
 
         /**
+         * 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.
          *
@@ -151 +163 @@
 
             if ( ! attachmentId && attachmentUrl ) {
-                parsedUrl = document.createElement( 'a' );
-                parsedUrl.href = attachmentUrl;
-                isHostedEmbed = /vimeo|youtu\.?be/.test( parsedUrl.host );
+                isHostedEmbed = control.isHostedVideo( attachmentUrl );
             }
 

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

@@ -33 +33 @@
         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.' );
     });