From f539d6819f016d2f74fa45aa3c790f9b1b3029e1 Mon Sep 17 00:00:00 2001 From: Piyush Mishra Date: Mon, 10 May 2021 23:32:01 +0530 Subject: [PATCH] last commit today --- static/css/style.css | 12 +++++++++-- static/index.html | 24 +++++++++++++++++---- static/js/message.js | 51 ++++++++++++++++++++++++++++++++++++-------- 3 files changed, 72 insertions(+), 15 deletions(-) diff --git a/static/css/style.css b/static/css/style.css index 55a84ee..708b943 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -118,7 +118,7 @@ input { .cover-screen { position: fixed; top: 0; bottom: 0; left: 0; right: 0; - z-index: 999; + z-index: 100; } .chatpanel { @@ -244,7 +244,7 @@ input { .clip-win { position: fixed; - z-index: 9999; + z-index: 999; padding: 6px; bottom: 55px; left: 5px; @@ -284,6 +284,14 @@ input { width: 314px; } +#dialog { + z-index: 999; + position: fixed; + top: 80px; + width: 300px; + margin-left: -150px; + left: 50%; +} @media screen and (max-width: 600px) { div[name="error_msg"] { diff --git a/static/index.html b/static/index.html index e25977e..8b3ac2c 100644 --- a/static/index.html +++ b/static/index.html @@ -8,7 +8,7 @@
+ + + diff --git a/static/js/message.js b/static/js/message.js index 97a6608..a69a095 100644 --- a/static/js/message.js +++ b/static/js/message.js @@ -67,10 +67,7 @@ let Messages = class { var area = $('#message_area'); var elm = $('
', {class: 'message '+(isMe?'message-me':'message-other'), msgid: msg_id}); if(!no_name_message) { - if(sender == myinfo.kunjika) - elm.append($('
', {class: 'message-by'}).append('me')) - else - elm.append($('
', {class: 'message-by'}).append(vayakti[sender]+'('+sender.substr(0, 8)+')')) + elm.append($('
', {class: 'message-by'}).append(vayakti[sender]+'('+sender.substr(0, 8)+')')) } if(reply != null && reply.length > 0) { elm.append( @@ -93,10 +90,7 @@ let Messages = class { var area = $('#message_area'); var elm = $('
', {class: 'message '+(isMe?'message-me':'message-other'), msgid: msg_id}); if(!no_name_message) { - if(sender == myinfo.kunjika) - elm.append($('
', {class: 'message-by'}).append('me')) - else - elm.append($('
', {class: 'message-by'}).append(vayakti[sender]+'('+sender.substr(0, 8)+')')) + elm.append($('
', {class: 'message-by'}).append(vayakti[sender]+'('+sender.substr(0, 8)+')')) } elm.append($('', {src: src, width: 300})); elm.click(function() { @@ -122,7 +116,7 @@ let Messages = class { static selectedMessageToText() { var text = ""; $('.message.active').each(function() { - text += $(this).find('.message-by').text()+' : '; + text += $(this).find('.message-by').text() + ' : '; text += $(this).find('pre').last().text() + '\n'; }); @@ -153,8 +147,47 @@ let Messages = class { $('#action_clip').addClass('is-hidden'); } + static deleteMessages() { + var prop = { + title: 'Delete Messages', + text: 'Do you really want to delete?', + checkLabel: 'Delete both side', + check: true + } + + dialog(prop, function() { + if($('#dialog_check').prop('checked')) { + + } else $('.message.active').remove(); + }); + + $('#selected_clip').addClass('is-hidden'); + } + static currentTime() { var today = new Date(); return today.getHours()+':'+('0' + today.getMinutes()).slice(-2); } } + +var callback; +function dialog(prop, call) { + callback = call; + $('#dialog_title').text(prop.title); + $('#dialog_text').text(prop.text); + $('#dialog_check_label').text(prop.checkLabel); + + if(prop.check) $('#dialog_checkbox').removeClass('is-hidden'); + else $('#dialog_checkbox').addClass('is-hidden'); + + $('#dialog').removeClass('is-hidden'); +} + +$('#dialog_cancel').click(function() { + $('#dialog').addClass('is-hidden'); +}); + +$('#dialog_ok').click(function() { + $('#dialog').addClass('is-hidden'); + callback(); +});