kev
/
Onionr
1
0
Fork 0
Code Issues 24 Pull Requests Projects Releases 2 Wiki Activity

fix mail sorting and send fields not being cleared

This commit is contained in:
Kevin Froman 2020-02-02 18:29:20 -06:00
parent 5c3fb5bec3
commit 79a3f725be
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
static-data/www/mail/mail.js
View File

@ -91,12 +91,12 @@ function openThread(bHash, sender, date, sigBool, pubkey, subjectLine){
messageDisplay.innerText = resp messageDisplay.innerText = resp
var sigEl = document.getElementById('sigValid') var sigEl = document.getElementById('sigValid')
var sigMsg = 'signature' var sigMsg = 'signature'
// show add unknown contact button if peer is unknown // show add unknown contact button if peer is unknown
if (sender !== myPub && sigBool){ if (sender !== myPub && sigBool){
addUnknownContact.style.display = 'inline' addUnknownContact.style.display = 'inline'
} }
if (sigBool){ if (sigBool){
sigMsg = 'Good ' + sigMsg sigMsg = 'Good ' + sigMsg
sigEl.classList.remove('danger') sigEl.classList.remove('danger')
@ -233,7 +233,7 @@ function loadInboxEntries(bHash){
else{ else{
subjectLine.innerText = '(' + metadata['subject'] + ')' subjectLine.innerText = '(' + metadata['subject'] + ')'
} }
//entry.innerHTML = 'sender ' + resp['meta']['signer'] + ' - ' + resp['meta']['time'] //entry.innerHTML = 'sender ' + resp['meta']['signer'] + ' - ' + resp['meta']['time']
threadPart.appendChild(entry) threadPart.appendChild(entry)
entry.appendChild(deleteBtn) entry.appendChild(deleteBtn)
entry.appendChild(bHashDisplay) entry.appendChild(bHashDisplay)
@ -254,7 +254,7 @@ function loadInboxEntries(bHash){
entry.parentNode.removeChild(entry); entry.parentNode.removeChild(entry);
deleteMessage(entry.getAttribute('data-hash')) deleteMessage(entry.getAttribute('data-hash'))
} }
}.bind(bHash)) }.bind(bHash))
} }
@ -264,7 +264,6 @@ function getInbox(){
} }
var els = document.getElementsByClassName('threadEntry') var els = document.getElementsByClassName('threadEntry')
var showed = false var showed = false
var requested = ''
for(var i = 0; i < pms.length; i++) { for(var i = 0; i < pms.length; i++) {
var add = true var add = true
if (pms[i].trim().length == 0){ if (pms[i].trim().length == 0){
@ -365,7 +364,7 @@ fetch('/mail/getinbox', {
}}) }})
.then((resp) => resp.text()) .then((resp) => resp.text())
.then(function(data) { .then(function(data) {
pms = data.split(',').reverse() pms = data.split(',')
if (pms.length > 0){ if (pms.length > 0){
noInbox.style.display = 'none' noInbox.style.display = 'none'
} }

5
static-data/www/mail/sendmail.js
View File

@ -24,7 +24,6 @@ subject = document.getElementById('draftSubject')
friendPicker = document.getElementById('friendSelect') friendPicker = document.getElementById('friendSelect')
function sendMail(toData, message, subject){ function sendMail(toData, message, subject){
//postData = {"postData": '{"to": "' + to + '", "message": "' + message + '"}'} // galaxy brain
postData = {'message': message, 'to': toData, 'type': 'pm', 'encrypt': true, 'meta': JSON.stringify({'subject': subject})} postData = {'message': message, 'to': toData, 'type': 'pm', 'encrypt': true, 'meta': JSON.stringify({'subject': subject})}
postData = JSON.stringify(postData) postData = JSON.stringify(postData)
sendForm.style.display = 'none' sendForm.style.display = 'none'
@ -35,13 +34,15 @@ function sendMail(toData, message, subject){
"content-type": "application/json", "content-type": "application/json",
"token": webpass "token": webpass
}}) }})
.then((resp) => resp.text()) // Transform the data into json .then((resp) => resp.text()) // Transform the data into text
.then(function(data) { .then(function(data) {
sendForm.style.display = 'block' sendForm.style.display = 'block'
PNotify.success({ PNotify.success({
text: 'Queued for sending!' text: 'Queued for sending!'
}) })
to.value = subject.value = messageContent.value = "" to.value = subject.value = messageContent.value = ""
friendPicker.value = ""
subject.value = ""
}) })
} }

2
tests/runtime-result.txt
View File

@ -1 +1 @@
1580635315 1580689731