Ticket #41052: 41052-2.video.patch

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

@@ -146 +146 @@
                                          */
                                         fetch: function() {
                                                 var embedLinkView = this, fetchSuccess, matches, fileExt, urlParser, url, re, youTubeEmbedMatch; // eslint-disable-line consistent-this
+                                                url = embedLinkView.model.get( 'url' );
 
                                                 if ( embedLinkView.dfd && 'pending' === embedLinkView.dfd.state() ) {
                                                         embedLinkView.dfd.abort();
@@ -152 +153 @@
                                                 }
 
                                                 // Abort if the URL field was emptied out.
-                                                if ( ! embedLinkView.model.get( 'url' ) ) {
+                                                if ( ! url ) {
                                                         embedLinkView.setErrorNotice( '' );
                                                         return;
                                                 }
 
+                                                // only proceed with embed if the field contains more than 11 characters
+                                                // Example: http://a.io is 11 chars
+                                                if ( url && ( url.length < 11 || ! url.match(/(http|https):\/\/(\w+:{0,1}\w*)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%!\-\/]))?/) ) ) {
+                                                        var embedLinkView = this; // eslint-disable-line consistent-this
+                                                        $( '#embed-url-field' ).addClass( 'invalid' );
+                                                        embedLinkView.setAddToWidgetButtonDisabled( true );
+                                                        return;
+                                                }
+
                                                 fetchSuccess = function( response ) {
                                                         embedLinkView.renderoEmbed({
                                                                 data: {
@@ -170 +180 @@
                                                 };
 
                                                 urlParser = document.createElement( 'a' );
-                                                urlParser.href = embedLinkView.model.get( 'url' );
+                                                urlParser.href = url;
                                                 matches = urlParser.pathname.toLowerCase().match( /\.(\w+)$/ );
                                                 if ( matches ) {
                                                         fileExt = matches[1];
@@ -191 +201 @@
                                                 }
 
                                                 // Support YouTube embed links.
-                                                url = embedLinkView.model.get( 'url' );
                                                 re = /https?:\/\/www\.youtube\.com\/embed\/([^/]+)/;
                                                 youTubeEmbedMatch = re.exec( url );
                                                 if ( youTubeEmbedMatch ) {

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

@@ -4733 +4733 @@
                 this.$('.embed-container').hide().find('.embed-preview').empty();
                 this.$( '.setting' ).hide();
 
-                // only proceed with embed if the field contains more than 11 characters
-                // Example: http://a.io is 11 chars
-                if ( url && ( url.length < 11 || ! url.match(/^http(s)?:\/\//) ) ) {
+                // If URL is blank.
+                if ( ! url ) {
                         return;
                 }