From f0e78103422fd86d7199672c294def65be588228 Mon Sep 17 00:00:00 2001 From: Kevin Froman Date: Sun, 29 Sep 2019 16:32:46 -0500 Subject: [PATCH] split mail reply on - --- onionr/onionrcommands/restartonionr.py | 3 +++ static-data/www/mail/mail.js | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/onionr/onionrcommands/restartonionr.py b/onionr/onionrcommands/restartonionr.py index 89e5c364..f21b5a70 100644 --- a/onionr/onionrcommands/restartonionr.py +++ b/onionr/onionrcommands/restartonionr.py @@ -25,6 +25,7 @@ import platform from etc import onionrvalues from onionrutils import localcommand import logger +import filepaths from . import daemonlaunch @@ -36,6 +37,8 @@ def restart(): while localcommand.local_command('ping', maxWait=8) == 'pong!': time.sleep(0.3) time.sleep(9) + while os.path.exists(filepaths.private_API_host_file): + time.sleep(1) subprocess.Popen([SCRIPT_NAME, 'start']) restart.onionr_help = 'Gracefully restart Onionr' diff --git a/static-data/www/mail/mail.js b/static-data/www/mail/mail.js index 6b7def2b..e411a4c1 100755 --- a/static-data/www/mail/mail.js +++ b/static-data/www/mail/mail.js @@ -65,7 +65,7 @@ function openReply(bHash, quote, subject){ if (typeof humanReadableCache[key] != 'undefined'){ document.getElementById('draftID').value = humanReadableCache[key] - quote = '\n' + humanReadableCache[key].split(' ').slice(0,3).join(' ') + ' wrote:\n' + splitQuotes.join('\n') + quote = '\n' + humanReadableCache[key].split('-').slice(0,3).join('-') + ' wrote:\n' + splitQuotes.join('\n') } else{ quote = '\n' + key.substring(0, 12) + ' wrote:' + '\n' + splitQuotes.join('\n')