From 2dd4bc7388950661ef1b71e8474b0e5c937bc15a Mon Sep 17 00:00:00 2001
From: Weston Ruter <westonruter@git.wordpress.org>
Date: Wed, 17 May 2017 01:58:16 +0000
Subject: [PATCH] Media: Trim whitespace in URLs provided for external embeds.

Also avoid showing error notice in media widget when URL field is empty.

Props timmydcrawford, westonruter.
Fixes #40771.


git-svn-id: https://develop.svn.wordpress.org/trunk@40772 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/js/widgets/media-widgets.js    | 9 ++++++---
 src/wp-includes/js/media-views.js           | 2 +-
 src/wp-includes/js/media/views/embed/url.js | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/wp-admin/js/widgets/media-widgets.js b/src/wp-admin/js/widgets/media-widgets.js
index cd03b09633..81c7c72c26 100644
--- a/src/wp-admin/js/widgets/media-widgets.js
+++ b/src/wp-admin/js/widgets/media-widgets.js
@@ -142,9 +142,6 @@ wp.mediaWidgets = ( function( $ ) {
 					/**
 					 * Fetch media.
 					 *
-					 * This is a TEMPORARY measure until the WP API supports an oEmbed proxy endpoint. See #40450.
-					 *
-					 * @see https://core.trac.wordpress.org/ticket/40450
 					 * @returns {void}
 					 */
 					fetch: function() {
@@ -154,6 +151,12 @@ wp.mediaWidgets = ( function( $ ) {
 							embedLinkView.dfd.abort();
 						}
 
+						// Abort if the URL field was emptied out.
+						if ( ! embedLinkView.model.get( 'url' ) ) {
+							embedLinkView.setErrorNotice( '' );
+							return;
+						}
+
 						fetchSuccess = function( response ) {
 							embedLinkView.renderoEmbed({
 								data: {
diff --git a/src/wp-includes/js/media-views.js b/src/wp-includes/js/media-views.js
index 1bdc6e6575..75cf452f50 100644
--- a/src/wp-includes/js/media-views.js
+++ b/src/wp-includes/js/media-views.js
@@ -4739,7 +4739,7 @@ EmbedUrl = View.extend({
 	},
 
 	url: function( event ) {
-		this.model.set( 'url', event.target.value );
+		this.model.set( 'url', $.trim( event.target.value ) );
 	},
 
 	/**
diff --git a/src/wp-includes/js/media/views/embed/url.js b/src/wp-includes/js/media/views/embed/url.js
index 3c99ca59ca..ab2863f1d0 100644
--- a/src/wp-includes/js/media/views/embed/url.js
+++ b/src/wp-includes/js/media/views/embed/url.js
@@ -60,7 +60,7 @@ EmbedUrl = View.extend({
 	},
 
 	url: function( event ) {
-		this.model.set( 'url', event.target.value );
+		this.model.set( 'url', $.trim( event.target.value ) );
 	},
 
 	/**