From 086d4bae32757d3cc01ce23fe662bb9b1217c1d3 Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 14 Sep 2017 12:01:57 +0200 Subject: [PATCH 1/4] clean up contacts initialization --- www/contacts/main.js | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/www/contacts/main.js b/www/contacts/main.js index 95642b503..7e73bbb23 100644 --- a/www/contacts/main.js +++ b/www/contacts/main.js @@ -6,19 +6,21 @@ define([ '/common/common-messenger.js', '/contacts/messenger-ui.js', + '/bower_components/nthen/index.js', 'less!/bower_components/components-font-awesome/css/font-awesome.min.css', 'less!/customize/src/less/cryptpad.less', -], function ($, Crypto, Toolbar, Cryptpad, Messenger, UI) { +], function ($, Crypto, Toolbar, Cryptpad, Messenger, UI, Nthen) { var Messages = Cryptpad.Messages; - var APP = window.APP = { Cryptpad: Cryptpad }; - $(function () { - - var andThen = function () { + Nthen(function (waitFor) { + $(waitFor()); + }).nThen(function (waitFor) { + Cryptpad.ready(waitFor(Cryptpad.reportAppUsage)); + }).nThen(function () { Cryptpad.addLoadingScreen(); var ifrw = $('#pad-iframe')[0].contentWindow; @@ -56,12 +58,5 @@ define([ var messenger = window.messenger = Messenger.messenger(Cryptpad); UI.create(messenger, $list, $messages); - }; - - Cryptpad.ready(function () { - andThen(); - Cryptpad.reportAppUsage(); - }); - }); }); From 4f6909fce34b6d4cdfbd0470caf19555c04d08bb Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 14 Sep 2017 12:07:21 +0200 Subject: [PATCH 2/4] set icon to 'faded' styles --- www/contacts/messenger-ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/contacts/messenger-ui.js b/www/contacts/messenger-ui.js index 089f1f992..0119bcd7c 100644 --- a/www/contacts/messenger-ui.js +++ b/www/contacts/messenger-ui.js @@ -129,7 +129,7 @@ define([ console.error('No more messages to fetch'); channel.exhausted = true; console.log(channel); - return; + return void $moreHistory.addClass('faded'); } else { channel.TAIL = msg.sig; } From 5b45e9225080ea848ab1bc909b55570a9020ff6a Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 14 Sep 2017 12:08:41 +0200 Subject: [PATCH 3/4] delete range requests after they have completed --- www/common/common-messenger.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/www/common/common-messenger.js b/www/common/common-messenger.js index f40b85ae8..476e60b52 100644 --- a/www/common/common-messenger.js +++ b/www/common/common-messenger.js @@ -129,6 +129,10 @@ define([ return messenger.range_requests[txid]; }; + var deleteRangeRequest = function (txid) { + delete messenger.range_requests[txid]; + }; + messenger.getMoreHistory = function (curvePublic, hash, count, cb) { if (typeof(cb) !== 'function') { return; } @@ -393,7 +397,8 @@ define([ }); orderMessages(curvePublic, decrypted, req.sig); - return void req.cb(void 0, decrypted); + req.cb(void 0, decrypted); + return deleteRangeRequest(txid); } else { console.log(parsed); } From 15db6b180c78892c07bb6222d946fe0eab1952fc Mon Sep 17 00:00:00 2001 From: ansuz Date: Thu, 14 Sep 2017 13:43:13 +0200 Subject: [PATCH 4/4] copy bug fixes from changes --- www/common/common-interface.js | 38 +++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/www/common/common-interface.js b/www/common/common-interface.js index 467cad4ab..a22b4d394 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -209,7 +209,16 @@ define([ return tagger; }; - UI.alert = function (msg, cb, force) { + UI.alert = function (msg, cb, opt) { + var force = false; + if (typeof(opt) === 'object') { + force = opt.force || false; + } else if (typeof(opt) === 'boolean') { + force = opt; + } + if (typeof(opt) !== 'object') { + opt = {}; + } cb = cb || function () {}; var message; @@ -228,6 +237,7 @@ define([ dialog.nav(ok), ]); + if (opt.forefront) { $(frame).addClass('forefront'); } var listener; var close = Util.once(function () { $(frame).fadeOut(150, function () { $(this).remove(); }); @@ -269,22 +279,25 @@ define([ ]); var listener; - var close = Util.once(function () { - $(frame).fadeOut(150, function () { $(this).remove(); }); - stopListening(listener); + var close = Util.once(function (result, ev) { + var $frame = $(frame).fadeOut(150, function () { + stopListening(listener); + $frame.remove(); + cb(result, ev); + }); }); - var $ok = $(ok).click(function (ev) { cb(input.value, ev); }); - var $cancel = $(cancel).click(function (ev) { cb(null, ev); }); + var $ok = $(ok).click(function (ev) { close(input.value, ev); }); + var $cancel = $(cancel).click(function (ev) { close(null, ev); }); listener = listenForKeys(function () { // yes - close(); $ok.click(); + $ok.click(); }, function () { // no - close(); $cancel.click(); + $cancel.click(); }); document.body.appendChild(frame); setTimeout(function () { - input.select().focus(); + $(input).select().focus(); UI.notify(); }); }; @@ -312,13 +325,14 @@ define([ ]); var listener; - var close = Util.once(function () { + var close = Util.once(function (bool, ev) { $(frame).fadeOut(150, function () { $(this).remove(); }); stopListening(listener); + cb(bool, ev); }); - var $ok = $(ok).click(function (ev) { close(); cb(true, ev); }); - var $cancel = $(cancel).click(function (ev) { close(); cb(false, ev); }); + var $ok = $(ok).click(function (ev) { close(true, ev); }); + var $cancel = $(cancel).click(function (ev) { close(false, ev); }); if (opt.cancelClass) { $cancel.addClass(opt.cancelClass); } if (opt.okClass) { $ok.addClass(opt.okClass); }