bug fixes
This commit is contained in:
sairaj mote
parent
7abb09772c
commit
f103ab16ce
17
css/main.css
17
css/main.css
@ -1360,9 +1360,6 @@ sm-button[variant=primary] {
|
||||
font-weight: 400;
|
||||
max-width: 90%;
|
||||
}
|
||||
.mail .back {
|
||||
margin-left: -0.5rem;
|
||||
}
|
||||
.mail .mail-subject,
|
||||
.mail .mail-content {
|
||||
overflow-wrap: break-word;
|
||||
@ -1985,20 +1982,6 @@ sm-button[variant=primary] {
|
||||
width: 1em;
|
||||
}
|
||||
|
||||
.back {
|
||||
padding: 0.7rem;
|
||||
height: 2.4rem;
|
||||
width: 2.4rem;
|
||||
margin-left: -0.5rem;
|
||||
cursor: pointer;
|
||||
stroke-width: 8;
|
||||
opacity: 0.8;
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
}
|
||||
.back:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
#settings #settings_sidebar header {
|
||||
padding: 1rem 1.5rem;
|
||||
}
|
||||
|
||||
2
css/main.min.css
vendored
2
css/main.min.css
vendored
File diff suppressed because one or more lines are too long
@ -1204,9 +1204,6 @@ sm-button[variant="primary"] {
|
||||
font-weight: 400;
|
||||
max-width: 90%;
|
||||
}
|
||||
.back {
|
||||
margin-left: -0.5rem;
|
||||
}
|
||||
.mail-subject,
|
||||
.mail-content {
|
||||
overflow-wrap: break-word;
|
||||
@ -1770,19 +1767,6 @@ sm-button[variant="primary"] {
|
||||
width: 1em;
|
||||
}
|
||||
}
|
||||
.back {
|
||||
padding: 0.7rem;
|
||||
height: 2.4rem;
|
||||
width: 2.4rem;
|
||||
margin-left: -0.5rem;
|
||||
cursor: pointer;
|
||||
stroke-width: 8;
|
||||
opacity: 0.8;
|
||||
-webkit-tap-highlight-color: transparent;
|
||||
&:hover {
|
||||
opacity: 1;
|
||||
}
|
||||
}
|
||||
#settings {
|
||||
#settings_sidebar header {
|
||||
padding: 1rem 1.5rem;
|
||||
|
||||
64
index.html
64
index.html
@ -1409,7 +1409,8 @@
|
||||
async function showPage(targetPage, options = {}) {
|
||||
const { firstLoad, hashChange } = options
|
||||
let pageId
|
||||
let subPageId
|
||||
let subPageId1
|
||||
let subPageId2
|
||||
let params = {}
|
||||
let searchParams
|
||||
if (targetPage === '') {
|
||||
@ -1425,11 +1426,13 @@
|
||||
searchParams = splitAddress.pop()
|
||||
const pages = splitAddress.pop().split('/')
|
||||
pageId = pages[1]
|
||||
subPageId = pages[2]
|
||||
subPageId1 = pages[2]
|
||||
subPageId2 = pages[3]
|
||||
} else {
|
||||
const pages = targetPage.split('/')
|
||||
pageId = pages[1]
|
||||
subPageId = pages[2]
|
||||
subPageId1 = pages[2]
|
||||
subPageId2 = pages[3]
|
||||
}
|
||||
} else {
|
||||
pageId = targetPage
|
||||
@ -1458,7 +1461,7 @@
|
||||
targetPage = 'sign_up'
|
||||
break;
|
||||
case 'chat_page':
|
||||
if (subPageId && activeChat.floID) {
|
||||
if (subPageId1 && activeChat.floID) {
|
||||
getRef('chat_view').classList.remove('hide')
|
||||
getRef('chat_view').classList.remove('hide-on-mobile')
|
||||
getRef('contacts').classList.add('hide-on-mobile')
|
||||
@ -1473,9 +1476,9 @@
|
||||
removeNotificationBadge('chat_page_button')
|
||||
break;
|
||||
case 'mail_page':
|
||||
if (subPageId) {
|
||||
if (subPageId1) {
|
||||
let childIndex
|
||||
switch (subPageId) {
|
||||
switch (subPageId1) {
|
||||
case 'inbox':
|
||||
childIndex = 0
|
||||
break;
|
||||
@ -1484,13 +1487,25 @@
|
||||
break;
|
||||
}
|
||||
showChildElement('mail_sections', childIndex)
|
||||
getRef("mail_type_selector").value = subPageId
|
||||
getRef("mail_type_selector").value = subPageId1
|
||||
if (subPageId2 && activeMail) {
|
||||
getRef('mail').classList.remove('hide')
|
||||
getRef('mail').classList.remove('hide-on-mobile')
|
||||
getRef('mails').classList.add('hide-on-mobile')
|
||||
getRef('main_navbar').classList.add('hide-on-mobile')
|
||||
} else {
|
||||
history.replaceState(null, null, `#/mail_page/${subPageId1}`);
|
||||
getRef('mail').classList.add('hide-on-mobile')
|
||||
getRef('mails').classList.remove('hide-on-mobile')
|
||||
activeMail = ''
|
||||
getRef('main_navbar').classList.remove('hide-on-mobile')
|
||||
}
|
||||
}
|
||||
removeNotificationBadge('mail_page_button')
|
||||
break;
|
||||
case 'settings':
|
||||
if (subPageId) {
|
||||
showPanel(subPageId)
|
||||
if (subPageId1) {
|
||||
showPanel(subPageId1)
|
||||
} else {
|
||||
hidePanel()
|
||||
}
|
||||
@ -1936,8 +1951,7 @@
|
||||
</script>
|
||||
|
||||
<script>
|
||||
let activeMailPage = getRef('mails'),
|
||||
activeChat = {},
|
||||
let activeChat = {},
|
||||
activeMail,
|
||||
frag = document.createDocumentFragment()
|
||||
|
||||
@ -1986,17 +2000,18 @@
|
||||
senderName = getContactName(from);
|
||||
floID = from
|
||||
}
|
||||
const backURL = `#/mail_page/${getRef('mail_type_selector').value}`
|
||||
return html.node`
|
||||
<div class="mail">
|
||||
<header class="mail-header flex flex-direction-column">
|
||||
<div class="flex space-between align-center">
|
||||
<div class="flex align-center">
|
||||
<button onclick="goto('mails')" class="back hide-on-desktop">
|
||||
<svg class="icon margin-right-0-5" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000">
|
||||
<a href="${backURL}" class="button icon-only back-button hide-on-desktop">
|
||||
<svg class="icon" xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000">
|
||||
<path d="M0 0h24v24H0V0z" fill="none"></path>
|
||||
<path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"></path>
|
||||
</svg>
|
||||
</button>
|
||||
</a>
|
||||
<div class="initial flex align-center" style=${`--contact-color: var(${contactColor(floID)})`}>${senderName.charAt(0)}</div>
|
||||
</div>
|
||||
<time class="date justify-right">${getFormattedTime(timestamp)}</time>
|
||||
@ -2756,20 +2771,12 @@
|
||||
if (this.checked) {
|
||||
isEnterSend = true
|
||||
localStorage.setItem("isEnterSend", 'true');
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
isEnterSend = false
|
||||
localStorage.setItem("isEnterSend", 'false');
|
||||
}
|
||||
})
|
||||
|
||||
function goto(page) {
|
||||
getRef('mail').classList.add('hide-on-mobile')
|
||||
getRef('mails').classList.remove('hide-on-mobile')
|
||||
activeMailPage = getRef('mails')
|
||||
getRef('main_navbar').classList.remove('hide-on-mobile')
|
||||
}
|
||||
|
||||
getRef("mail_type_selector").addEventListener('change', function (e) {
|
||||
location.hash = `#/mail_page/${e.target.value}`
|
||||
})
|
||||
@ -2781,12 +2788,6 @@
|
||||
activeMail.classList.remove('active')
|
||||
e.target.closest(".mail-card").classList.add('active')
|
||||
activeMail = e.target.closest(".mail-card")
|
||||
if (activeMailPage.id === 'mails') {
|
||||
getRef('mail').classList.remove('hide-on-mobile')
|
||||
getRef('mails').classList.add('hide-on-mobile')
|
||||
activeMailPage = getRef('mail')
|
||||
getRef('main_navbar').classList.add('hide-on-mobile')
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
@ -2808,8 +2809,7 @@
|
||||
if (e.code === "Enter" && e.shiftKey) {
|
||||
e.preventDefault()
|
||||
getRef('type_message').value += '\r\n';
|
||||
}
|
||||
else if (!e.shiftKey && e.code === "Enter" && isEnterSend) {
|
||||
} else if (!e.shiftKey && e.code === "Enter" && isEnterSend) {
|
||||
e.preventDefault()
|
||||
sendMessage()
|
||||
}
|
||||
@ -3066,7 +3066,7 @@
|
||||
getRef("show_reply_popup").classList.remove("hide");
|
||||
}
|
||||
messenger.removeMark(mailRef, "unread");
|
||||
getRef('mail').classList.remove('hide')
|
||||
location.hash = `#/mail_page/${getRef("mail_type_selector").value}/mail`
|
||||
}).catch(error => notify("Unable to read mail", "error", error))
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user