deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-29 10:40:35 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1773 from thelounge/astorije/fix-default-from

Browse source 
Fix default value given to `Msg.from`
This commit is contained in:
Pavel Djundik 2017-11-30 11:25:30 +02:00 committed by GitHub
parent fd72179b3d c0d348a678
commit bdbdb69f02
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/views/actions/topic.tpl
View file

@ -1,4 +1,4 @@
{{#if from}} {{#if from.nick}}
{{> ../user_name from}} {{> ../user_name from}}
has changed the topic to: has changed the topic to:
{{else}} {{else}}

2
client/views/msg.tpl
View file

@ -3,7 +3,7 @@
{{tz time}} {{tz time}}
</span> </span>
<span class="from"> <span class="from">
{{#if from}} {{#if from.nick}}
{{> user_name from}} {{> user_name from}}
{{/if}} {{/if}}
</span> </span>

2
src/models/msg.js
View file

@ -7,7 +7,7 @@ var id = 0;
class Msg { class Msg {
constructor(attr) { constructor(attr) {
_.defaults(this, attr, { _.defaults(this, attr, {
from: "", from: {},
id: id++, id: id++,
previews: [], previews: [],
text: "", text: "",