summaryrefslogtreecommitdiff
path: root/addons/mail/static/src/js/utils.js
diff options
context:
space:
mode:
authorNicolas Lempereur <nle@odoo.com>2016-12-23 16:41:35 +0100
committerNicolas Lempereur <nle@odoo.com>2016-12-26 10:26:21 +0100
commit88d7e7f646a2b2bf2bda3c83b37ec18190686a5c (patch)
tree0d0a906a872037576c5c385f3e59ff7dd75c5911 /addons/mail/static/src/js/utils.js
parent562f141ffc13adcaa23c694dfba213a890f6e1ef (diff)
Revert "[FIX] mail: livechat escaping"
This reverts commit 1c60a631df8b42b90973e117eae5d510fcc0f223. The fix was done to conciliate 83956d4 and ff56304f5 but ff56304f5 was forward-ported erroneously and introduced other issues. opw-702410
Diffstat (limited to 'addons/mail/static/src/js/utils.js')
-rw-r--r--addons/mail/static/src/js/utils.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/static/src/js/utils.js b/addons/mail/static/src/js/utils.js
index 1870db4c4a1..db82b976945 100644
--- a/addons/mail/static/src/js/utils.js
+++ b/addons/mail/static/src/js/utils.js
@@ -69,10 +69,10 @@ function linkify(text, attrs) {
attrs = _.map(attrs, function (value, key) {
return key + '="' + _.escape(value) + '"';
}).join(' ');
- return text.replace(/&nbsp;/g, '\u00A0').replace(url_regexp, function (url) {
+ return text.replace(url_regexp, function (url) {
var href = (!/^(f|ht)tps?:\/\//i.test(url)) ? "http://" + url : url;
return '<a ' + attrs + ' href="' + href + '">' + url + '</a>';
- }).replace(/\u00A0/g, '&nbsp;');
+ });
}
function add_link (node, transform_children) {