From fb189a6d5c2693c2fc196a702ff24336670bf643 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 21 Aug 2019 00:26:45 +0000 Subject: [PATCH] Customizer: Trim whitespace from custom link URLs. This complements a similar fix for the Menus screen in [45655]. Props donmhico, audrasjb. Fixes #47888. See #47723. git-svn-id: https://develop.svn.wordpress.org/trunk@45869 602fd350-edb4-49c9-b593-d223f7449a82 --- src/js/_enqueues/lib/nav-menu.js | 2 +- src/js/_enqueues/wp/customize/nav-menus.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/js/_enqueues/lib/nav-menu.js b/src/js/_enqueues/lib/nav-menu.js index cd62acc36f..3f1f9a7480 100644 --- a/src/js/_enqueues/lib/nav-menu.js +++ b/src/js/_enqueues/lib/nav-menu.js @@ -944,7 +944,7 @@ }, addCustomLink : function( processMethod ) { - var url = $('#custom-menu-item-url').val(), + var url = $('#custom-menu-item-url').val().trim(), label = $('#custom-menu-item-name').val(); processMethod = processMethod || api.addMenuItemToBottom; diff --git a/src/js/_enqueues/wp/customize/nav-menus.js b/src/js/_enqueues/wp/customize/nav-menus.js index b6560366c1..69067706b3 100644 --- a/src/js/_enqueues/wp/customize/nav-menus.js +++ b/src/js/_enqueues/wp/customize/nav-menus.js @@ -544,6 +544,7 @@ var menuItem, itemName = $( '#custom-menu-item-name' ), itemUrl = $( '#custom-menu-item-url' ), + url = itemUrl.val().trim(), urlRegex; if ( ! this.currentMenuControl ) { @@ -567,14 +568,14 @@ if ( '' === itemName.val() ) { itemName.addClass( 'invalid' ); return; - } else if ( ! urlRegex.test( itemUrl.val() ) ) { + } else if ( ! urlRegex.test( url ) ) { itemUrl.addClass( 'invalid' ); return; } menuItem = { 'title': itemName.val(), - 'url': itemUrl.val(), + 'url': url, 'type': 'custom', 'type_label': api.Menus.data.l10n.custom_label, 'object': 'custom'