diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-18 10:58:41 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-18 10:58:41 +0100 |
| commit | f854e01a983334e214357b4e05083b9a96a61be7 (patch) | |
| tree | 5ee4129d8b69f2cc92fb7eb0f143197520432cbb /addons/mail/static/src/js | |
| parent | e6b5a0e2ebe807ff14492c688c3a57bfad6f8e1b (diff) | |
| parent | 4aa153e65cf2995e3c109dab2958501e3911ff94 (diff) | |
[MERGE] forward port branch saas-11.3 up to 4aa153e65cf
Diffstat (limited to 'addons/mail/static/src/js')
| -rw-r--r-- | addons/mail/static/src/js/utils.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/static/src/js/utils.js b/addons/mail/static/src/js/utils.js index 4749ba11b20..740be8eb54d 100644 --- a/addons/mail/static/src/js/utils.js +++ b/addons/mail/static/src/js/utils.js @@ -22,7 +22,7 @@ function _parseAndTransform(nodes, transformFunction) { // Suggested URL Javascript regex of http://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url // Adapted to make http(s):// not required if (and only if) www. is given. So `should.notmatch` does not match. -var urlRegexp = /\b(?:https?:\/\/\d{1,3}(?:\.\d{1,3}){3}|(?:https?:\/\/|(?:www\.))[-a-z0-9@:%._+~#=]{2,256}\.[a-z]{2,13})\b(?:[-a-z0-9@:%_+.~#?&'$//=]*)/gi; +var urlRegexp = /\b(?:https?:\/\/\d{1,3}(?:\.\d{1,3}){3}|(?:https?:\/\/|(?:www\.))[-a-z0-9@:%._+~#=]{2,256}\.[a-z]{2,13})\b(?:[-a-z0-9@:%_+.~#?&'$//=;]*)/gi; function linkify(text, attrs) { attrs = attrs || {}; if (attrs.target === undefined) { |