diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-17 19:07:34 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-17 19:07:34 +0100 |
| commit | 19558129f0e2d5c9940f6fa95534840f8f025547 (patch) | |
| tree | 873b443891dc276d0ec1afda3e76aeb28dcef46a /addons/mail/static/src/js/utils.js | |
| parent | 71c4c13996d72243b9e5a063ebb416f74ea790cd (diff) | |
| parent | c0471dd85795f90b95ba7e647574417fdd1451ec (diff) | |
[MERGE] forward port branch saas-15 up to c0471dd8579
Diffstat (limited to 'addons/mail/static/src/js/utils.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 300e27da4bf..347b104e76c 100644 --- a/addons/mail/static/src/js/utils.js +++ b/addons/mail/static/src/js/utils.js @@ -60,7 +60,7 @@ function _parse_and_transform(nodes, transform_function) { // 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 url_regexp = /\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 url_regexp = /\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) { |