diff options
| author | Christophe Simonis <chs@odoo.com> | 2019-01-17 20:49:36 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2019-01-17 20:49:36 +0100 |
| commit | 4aa153e65cf2995e3c109dab2958501e3911ff94 (patch) | |
| tree | c8a8b6cab833200f78776589f67a0cb3f868ea2f /addons/mail/static/src/js/utils.js | |
| parent | 83cc046e9a90e8592d0d47c7162ab7bd923621ba (diff) | |
| parent | 19558129f0e2d5c9940f6fa95534840f8f025547 (diff) | |
[MERGE] forward port branch 11.0 up to 19558129f0e
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 16507035982..d1271bec2f3 100644 --- a/addons/mail/static/src/js/utils.js +++ b/addons/mail/static/src/js/utils.js @@ -18,7 +18,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) { |