From 086d4bae32757d3cc01ce23fe662bb9b1217c1d3 Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Thu, 14 Sep 2017 12:01:57 +0200
Subject: [PATCH] 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();
-    });
-
     });
 });