Commit @dccbb6f78aff390ee2ab04780f926654b375f257

Hyeonjae Park 2019-01-08

Merge branch 'feature/notification-regex' into next

Reviewed-by: Suwon Chae

@dccbb6f78aff390ee2ab04780f926654b375f257

3b34619

dccbb6f

app/views/index/partial_notifications.scala.html

--- app/views/index/partial_notifications.scala.html

+++ app/views/index/partial_notifications.scala.html


                     }
                 </div>
                 <div class="message-wrap nowrap" id="message-@noti.id">
-                    <div class="message">@Html(HtmlUtil.defaultSanitize(noti.getMessage.replaceAll("[^>]\n", "<br/>\n")))</div>
+                    <div class="message">@Html(HtmlUtil.defaultSanitize(noti.getMessage))</div>
                 </div>
                 <div class="meta">
                     @if(user != null){

     </li>
     }
 }
-@if( NotificationEvent.findByReceiver(UserApp.currentUser, from, size).size != 0){
-<li><a href="javascript: void(0);" id="notification-more" class="ybtn">More</a></li>
+@if(NotificationEvent.findByReceiver(UserApp.currentUser, from, size).size != 0) {
+<li><a href="javascript:void(0);" id="notification-more" class="ybtn">More</a></li>
 <script type="text/javascript">
     $(document).ready(function(){
         function checkOverflow(el) {

Add a comment

Open 0
Closed 0

List

...	...	@@ -67,7 +67,7 @@
67	67	}
68	68	</div>
69	69	<div class="message-wrap nowrap" id="message-@noti.id">
70		- <div class="message">@Html(HtmlUtil.defaultSanitize(noti.getMessage.replaceAll("[^>]\n", "<br/>\n")))</div>
	70	+ <div class="message">@Html(HtmlUtil.defaultSanitize(noti.getMessage))</div>
71	71	</div>
72	72	<div class="meta">
73	73	@if(user != null){
...	...	@@ -92,8 +92,8 @@
92	92	</li>
93	93	}
94	94	}
95		-@if( NotificationEvent.findByReceiver(UserApp.currentUser, from, size).size != 0){
96		-<li><a href="javascript: void(0);" id="notification-more" class="ybtn">More</a></li>
	95	+@if(NotificationEvent.findByReceiver(UserApp.currentUser, from, size).size != 0) {
	96	+<li><a href="javascript:void(0);" id="notification-more" class="ybtn">More</a></li>
97	97	<script type="text/javascript">
98	98	$(document).ready(function(){
99	99	function checkOverflow(el) {

Delete comment