From 75fa8bdf3563df1677cf664bc26da80fc51733df Mon Sep 17 00:00:00 2001 From: feigachaya Date: Mon, 14 Sep 2020 11:11:28 +0300 Subject: [PATCH] Update url-regex add support on ?key=value on url --- addon/utils/url-regex.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addon/utils/url-regex.js b/addon/utils/url-regex.js index 56b7d68..5473235 100644 --- a/addon/utils/url-regex.js +++ b/addon/utils/url-regex.js @@ -2,7 +2,7 @@ import { isBlank } from '@ember/utils'; // URL regex courtesy of https://github.com/kevva/url-regex function urlRegex () { - return /(["'])?(?:(?:(?:(?:https?|ftp|\w):)?\/\/)|(?:www.))(?:\S+(?::\S*)?@)?(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:1\d\d|2[0-4]\d|25[0-4]|[1-9]\d?))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:[/#]\S*)?\1/ig; + return /(["'])?(?:(?:(?:(?:https?|ftp|\w):)?\/\/)|(?:www.))(?:\S+(?::\S*)?@)?(?:(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:1\d\d|2[0-4]\d|25[0-4]|[1-9]\d?))|(?:(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)(?:\.(?:[a-z\u00a1-\uffff0-9]-*)*[a-z\u00a1-\uffff0-9]+)*(?:\.(?:[a-z\u00a1-\uffff]{2,})))(?::\d{2,5})?(?:[/#]\S*)?\1?(\?([\w-]+(=[\w-]*)?(&[\w-]+(=[\w-]*)?)*))?/ig; } // Shortens the URL and adds three dots to the end