Merge branch 'timetag' of https://github.com/Zash/converse.js into Zash-timetag

This commit is contained in:
JC Brand 2018-06-30 15:12:50 +02:00
commit 6e99af698d
2 changed files with 5 additions and 3 deletions

6
dist/converse.js vendored
View File

@ -85416,9 +85416,11 @@ __p += ' <span class="badge badge-secondary">' +
__e(role) + __e(role) +
'</span> '; '</span> ';
}); ; }); ;
__p += '\n </span>\n <span class="chat-msg-time">' + __p += '\n </span>\n <time timestamp="' +
__e(o.isodate) +
'" class="chat-msg-time">' +
__e(o.pretty_time) + __e(o.pretty_time) +
'</span>\n </span>\n <span class="chat-msg-text"></span>\n <div class="chat-msg-media"></div>\n </div>\n</div>\n'; '</time>\n </span>\n <span class="chat-msg-text"></span>\n <div class="chat-msg-media"></div>\n </div>\n</div>\n';
return __p return __p
}; };

View File

@ -7,7 +7,7 @@
<span class="chat-msg-author">{{{o.username}}} <span class="chat-msg-author">{{{o.username}}}
{[o.roles.forEach(function (role) { ]} <span class="badge badge-secondary">{{{role}}}</span> {[ }); ]} {[o.roles.forEach(function (role) { ]} <span class="badge badge-secondary">{{{role}}}</span> {[ }); ]}
</span> </span>
<span class="chat-msg-time">{{{o.pretty_time}}}</span> <time timestamp="{{{o.isodate}}}" class="chat-msg-time">{{{o.pretty_time}}}</time>
</span> </span>
<span class="chat-msg-text"></span> <span class="chat-msg-text"></span>
<div class="chat-msg-media"></div> <div class="chat-msg-media"></div>