[IMP] website_twitter: de-traw-ify

Not tested. I probably really need to add that replace() override
This commit is contained in:
Xavier Morel
2021-07-20 05:47:27 +00:00
parent 0691736b49
commit f7b1d02c16
2 changed files with 5 additions and 10 deletions
@@ -2,6 +2,7 @@ odoo.define('website_twitter.animation', function (require) {
'use strict';
var core = require('web.core');
const {Markup} = require('web.utils');
var publicWidget = require('web.public.widget');
var qweb = core.qweb;
@@ -47,7 +48,7 @@ publicWidget.registry.twitter = publicWidget.Widget.extend({
}
// Parse tweet text
tweet.text = tweet.text
tweet.text = Markup(_.escape(tweet.text)
.replace(
/[A-Za-z]+:\/\/[A-Za-z0-9-_]+\.[A-Za-z0-9-_:%&~\?\/.=]+/g,
function (url) {
@@ -65,18 +66,12 @@ publicWidget.registry.twitter = publicWidget.Widget.extend({
function (hashtag) {
return _makeLink('http://twitter.com/search?q='+hashtag.replace('#',''), hashtag);
}
);
));
return qweb.render('website.Twitter.Tweet', {tweet: tweet});
function _makeLink(url, text) {
var c = $('<a/>', {
text: text,
href: url,
target: '_blank',
rel: 'noreferrer noopener',
});
return c.prop('outerHTML');
return Markup`<a href="${url}" target="_blank" rel="noreferrer noopener">${text}</a>`;
}
});
@@ -16,7 +16,7 @@
<a class="date" target="_blank" t-attf-href="http://twitter.com/#{tweet.user.screen_name}/status/#{tweet.id_str}"><t t-esc="tweet.created_at"/></a>
</div>
<div class="bottom">
<p><t t-raw="tweet.text"/></p>
<p><t t-out="tweet.text"/></p>
</div>
</div>
</div>