Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
7e240195
Commit
7e240195
authored
Nov 15, 2018
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes #1288
Add CSS classes to differentiate between incoming and outgoing messages
parent
ecff1fd9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
CHANGES.md
CHANGES.md
+1
-0
dist/converse.js
dist/converse.js
+7
-5
src/templates/message.html
src/templates/message.html
+1
-1
No files found.
CHANGES.md
View file @
7e240195
...
@@ -12,6 +12,7 @@
...
@@ -12,6 +12,7 @@
-
#1188 Feature request: drag and drop file to HTTP Upload
-
#1188 Feature request: drag and drop file to HTTP Upload
-
#1268 Switch from SASS variables to CSS custom properties
-
#1268 Switch from SASS variables to CSS custom properties
-
#1278 Replace the default avatar with a SVG version
-
#1278 Replace the default avatar with a SVG version
-
#1288 Add CSS classes to differentiate between incoming and outgoing messages
-
#1305 added value 'all' for 'show_desktop_notifications' to notifiy even if converse.js is open
-
#1305 added value 'all' for 'show_desktop_notifications' to notifiy even if converse.js is open
-
#1306 added option
`notification_delay`
-
#1306 added option
`notification_delay`
-
#1312 Error
`unrecognized expression`
in Safari
-
#1312 Error
`unrecognized expression`
in Safari
...
...
dist/converse.js
View file @
7e240195
...
@@ -102627,25 +102627,27 @@ __e(o.isodate) +
...
@@ -102627,25 +102627,27 @@ __e(o.isodate) +
__e(o.pretty_time) +
__e(o.pretty_time) +
'</time>';
'</time>';
} ;
} ;
__p += '\n <span class="chat-msg__author">';
__p += '\n <span class="chat-msg__author chat-msg__' +
__e(o.sender) +
'">';
if (o.is_me_message) { ;
if (o.is_me_message) { ;
__p += '**';
__p += '**';
}; ;
}; ;
__p +=
__p +=
__e(o.username) +
__e(o.username) +
'</span>\n ';
'</span>\n ';
if (!o.is_me_message) { ;
__p += '\n ';
o.roles.forEach(function (role) { ;
o.roles.forEach(function (role) { ;
__p += ' <span class="badge badge-secondary">' +
__p += ' <span class="badge badge-secondary">' +
__e(role) +
__e(role) +
'</span> ';
'</span> ';
}); ;
}); ;
__p += '\n ';
__p += '\n <time timestamp="' +
if (!o.is_me_message) { ;
__p += '<time timestamp="' +
__e(o.isodate) +
__e(o.isodate) +
'" class="chat-msg__time">' +
'" class="chat-msg__time">' +
__e(o.pretty_time) +
__e(o.pretty_time) +
'</time>';
'</time>
\n
';
} ;
} ;
__p += '\n ';
__p += '\n ';
if (o.is_encrypted) { ;
if (o.is_encrypted) { ;
src/templates/message.html
View file @
7e240195
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
<div
class=
"chat-msg__content {[ if (o.is_me_message) { ]}chat-msg__content--action{[ } ]}"
>
<div
class=
"chat-msg__content {[ if (o.is_me_message) { ]}chat-msg__content--action{[ } ]}"
>
<span
class=
"chat-msg__heading"
>
<span
class=
"chat-msg__heading"
>
{[ if (o.is_me_message) { ]}
<time
timestamp=
"{{{o.isodate}}}"
class=
"chat-msg__time"
>
{{{o.pretty_time}}}
</time>
{[ } ]}
{[ if (o.is_me_message) { ]}
<time
timestamp=
"{{{o.isodate}}}"
class=
"chat-msg__time"
>
{{{o.pretty_time}}}
</time>
{[ } ]}
<span
class=
"chat-msg__author"
>
{[ if (o.is_me_message) { ]}**{[ }; ]}{{{o.username}}}
</span>
<span
class=
"chat-msg__author
chat-msg__{{{o.sender}}}
"
>
{[ if (o.is_me_message) { ]}**{[ }; ]}{{{o.username}}}
</span>
{[ if (!o.is_me_message) { ]}
{[ if (!o.is_me_message) { ]}
{[o.roles.forEach(function (role) { ]}
<span
class=
"badge badge-secondary"
>
{{{role}}}
</span>
{[ }); ]}
{[o.roles.forEach(function (role) { ]}
<span
class=
"badge badge-secondary"
>
{{{role}}}
</span>
{[ }); ]}
<time
timestamp=
"{{{o.isodate}}}"
class=
"chat-msg__time"
>
{{{o.pretty_time}}}
</time>
<time
timestamp=
"{{{o.isodate}}}"
class=
"chat-msg__time"
>
{{{o.pretty_time}}}
</time>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment