불가침, 종전 메시지

This commit is contained in:
2020-05-03 00:31:04 +09:00
parent 83e8cfc2cc
commit ce5ad89d5e
16 changed files with 477 additions and 98 deletions
+9 -1
View File
@@ -208,6 +208,14 @@ function redrawMsg(deferred, addFront){
else{
msg.invalidType = 'msg_valid';
}
if(msg.option && !msg.option.deletable){
msg.deletable = false;
}
else{
msg.deletable = true;
}
var msgHtml = TemplateEngine(messageTemplate, msg);
@@ -504,7 +512,7 @@ function activateMessageForm(){
jQuery(function($){
//tmp_template.html은 추후 msg.js에 통합될 수 있음
var getTemplate = $.get('js/templates/message.html?11',function(obj){
var getTemplate = $.get('js/templates/message.html?12',function(obj){
messageTemplate = obj;
});
+1 -1
View File
@@ -12,7 +12,7 @@
</div>
<div class="msg_body">
<div class="msg_header">
<%if(!this.option.action && src.id == myGeneralID && now <= last5min && invalidType == 'msg_valid'){%>
<%if(!this.option.action && src.id == myGeneralID && now <= last5min && invalidType == 'msg_valid' && !deletable){%>
<button type="button" data-erase_until="<%last5min%>" class="btn btn btn-outline-warning btn-sm btn-delete-msg" style='float:right'></button>
<%}%>
<%if(msgType == 'private') {%>