Commit 35c0cc47 by Lee Daehyun

MR インデント、function名変更

parent d5e76937
......@@ -138,12 +138,6 @@
<div id="userProfileModal"></div>
<div id="chatMenuModal"></div>
<div id="pictureModal"></div>
<!-- メニューモーダル -->
<!--#include virtual="modal_chat_menu.html" -->
<!-- プロフィールモーダル -->
<!--#include virtual="modal_chat_profile.html" -->
<!-- 写真メッセージーモーダル -->
<!--#include virtual="modal_chat_picture.html" -->
<script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/socket.io.js"></script>
......@@ -166,7 +160,7 @@
<script src="./js/chat-websocket.js"></script>
<script src="./js/chat-room.js"></script>
<script>
function test(image) {
function imageModal(image) {
$('#modal_image').attr('src',image.src);
$('#pictureModalCenter').modal('show');
}
......
......@@ -740,9 +740,6 @@ input[name="tab_item"] {
/**************************** modal *************************/
/* メニューモーダル */
.modal-body {
/*padding-left: 0.6rem;*/
}
.modal-body #modal_image {
width: 100%;
height: 100%;
......@@ -843,11 +840,11 @@ input[name="tab_item"] {
}
}
/*************************** ネームカード *************************/
.prifile_name {
padding-top: 20px;
padding-bottom: 20px;
line-height: 1.2;
font-size: 16px;
margin-left: auto;
margin-right: auto;
}
\ No newline at end of file
.prifile_name {
padding-top: 20px;
padding-bottom: 20px;
line-height: 1.2;
font-size: 16px;
margin-left: auto;
margin-right: auto;
}
\ No newline at end of file
......@@ -162,7 +162,7 @@ main {
.profile_modal .modal-header,.profile_modal .modal-body { padding-bottom: 0; }
.profile_modal .modal-footer button { width: 33%; padding: 5px; }
.profile_modal.w_50 .modal-footer button { width: 50%; padding: 5px; }
.profile_modal .modal-header .profile_desc{ width: 100%; }
.profile_modal .modal-header .profile_desc { width: 100%; }
.profile_modal .modal-header .profile_name {
width: 100%;
text-align: center;
......
......@@ -112,7 +112,7 @@ CHAT.uploadImage = function(formData) {
let downloadPath = CMS_SERVER_URL + '/chatapi/file/download?fileName=' + imageName + '&roomId=' + CHAT.globalLoginParameter.roomId;
// アップロードが終了した後ローディング画面から離れてメッセージをメッセージを転送する
const lightbox = $('<a/>', {'data-lightbox':'attachedImages', 'data-title':imageName});
const image = $('<img/>', {src:imgPath, width:'auto', style:'max-width:100%', 'data-toggle':'modal', onclick:'test(this);'});
const image = $('<img/>', {src:imgPath, width:'auto', style:'max-width:100%', 'data-toggle':'modal', onclick:'imageModal(this);'});
const downloadIcon = $('<a/>', {href:downloadPath, class:'fa fa-download', download:res.fileName});
lightbox.append(image);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment