Edit Message function.

1. Fix balloon tip position
2. Enable html for all message and purify html tag in SendMessageHandler
3. Remove "没有更多了"
This commit is contained in:
Harry Zhou
2017-06-21 22:52:11 +08:00
parent c204aefc93
commit 80f922e635
4 changed files with 5 additions and 7 deletions
+2 -1
View File
@@ -18,6 +18,7 @@ use App\Message;
use App\User;
use App\MessageContact;
use App\Http\Controllers\Controller;
use Mews\Purifier\PurifierServiceProvider;
class MessageController extends Controller
{
@@ -83,7 +84,7 @@ class MessageController extends Controller
//Create Message
$message = new Message;
$user_id = $sender;
$message->content = $content;
$message->content = clean($content);
$message->sender_id = $user_id;
$message->receiver_id = $receiver;
$message->save();
+1 -1
View File
@@ -26,7 +26,7 @@ return [
'HTML.Doctype' => 'HTML 4.01 Transitional',
'HTML.Allowed' => 'div,b,strong,i,em,u,a[href|title],ul,ol,li,p[style],br,span[style],img[width|height|alt|src]',
'CSS.AllowedProperties' => 'font,font-size,font-weight,font-style,font-family,text-decoration,padding-left,color,background-color,text-align',
'AutoFormat.AutoParagraph' => true,
'AutoFormat.AutoParagraph' => false,
'AutoFormat.RemoveEmpty' => true,
],
'test' => [
+1 -2
View File
@@ -57,8 +57,7 @@
height: 2em;
padding-top: 0.2em;
position: absolute;
top: 0.3em;
left: 5em;
left: 0em;
z-index: 10;
}
+1 -3
View File
@@ -59,15 +59,13 @@
<p v-if="messages.length == 0" style="text-align: center">暂无消息</p>
<div :class="{ hide: isHidden }">
<a href="javascript:void(0)" v-if="hasMore" v-on:click="getHistoryMessage(-1)">加载更多</a>
<p v-else>没有更多了</p>
<ul id="message-container" class="message-container">
<transition-group name="message-list" tag="ul">
<li :class="{ box: message.type !== 'history-info' }" class="msg message-list-item"
v-for="message in messages" v-bind:key="message.id">
<span v-if="message.type !== 'history-info'">
<img class="mavatar" :src="'/avatar/' + message.sender_id + '/64/64'"/>
<p v-if="contact_id == 0" class="message-content" v-html="message.content"></p>
<p v-else class="message-content">@{{ message.content }}</p>
<p class="message-content" v-html="message.content"></p>
<br/><br/>
<i class="time-tag">@{{ message.created_at }}</i>
</span>