mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-56252-master' of git://github.com/ryanwyllie/moodle

Browse Source
This commit is contained in:
David Monllao 2016-10-24 10:25:32 +08:00
commit 055cc7d037
6 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
message/amd/build/message_area_contacts.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
message/amd/src/message_area_contacts.js
View File

@ -546,6 +546,9 @@ define(['jquery', 'core/ajax', 'core/templates', 'core/notification', 'core/cust
* @return {String} The altered text
*/
Contacts.prototype._getContactText = function(text) {
// Remove the HTML tags to render the contact text.
text = $(document.createElement('div')).html(text).text();
if (text.length > this._messageLength) {
text = text.substr(0, this._messageLength - 3);
text += '...';

3
message/classes/helper.php
View File

@ -147,7 +147,8 @@ class helper {
$data->messageid = null;
if (isset($contact->smallmessage)) {
$data->ismessaging = true;
$data->lastmessage = $contact->smallmessage;
// Strip the HTML tags from the message for displaying in the contact area.
$data->lastmessage = clean_param($contact->smallmessage, PARAM_NOTAGS);
$data->useridfrom = $contact->useridfrom;
if (isset($contact->messageid)) {
$data->messageid = $contact->messageid;

2
theme/boost/scss/moodle/message.scss
View File

@ -473,6 +473,8 @@
position: relative;
.text {
display: block;
p {
margin: 0;
}

2
theme/bootstrapbase/less/moodle/message.less
View File

@ -465,6 +465,8 @@
position: relative;
.text {
display: block;
p {
margin: 0;
}

3
theme/bootstrapbase/style/moodle.css
View File

@ -6195,6 +6195,9 @@ a.ygtvspacer:hover {
border-radius: 4px;
position: relative;
}
.messaging-area-container .messaging-area .messages-area .messages .message .content .text {
display: block;
}
.messaging-area-container .messaging-area .messages-area .messages .message .content .text p {
margin: 0;
}