resolve merge conflicts

www/contacts/inner.js

@@ -2,12 +2,13 @@ define([
     'jquery',
     '/bower_components/chainpad-crypto/crypto.js',
     '/common/toolbar3.js',
-    '/common/cryptpad-common.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
     '/common/hyperscript.js',
     '/contacts/messenger-ui.js',
     '/common/sframe-messenger-inner.js',
+    '/customize/messages.js',
+    '/common/common-interface.js',
 
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
@@ -16,35 +17,26 @@ define([
     $,
     Crypto,
     Toolbar,
-    Cryptpad,
     nThen,
     SFCommon,
     h,
-    UI,
-    Messenger
+    MessengerUI,
+    Messenger,
+    Messages,
+    UI
     )
 {
-    var Messages = Cryptpad.Messages;
     var APP = {};
-    var onConnectError = function () {
-        Cryptpad.errorLoadingScreen(Messages.websocketError);
-    };
 
     var common;
     var sFrameChan;
     nThen(function (waitFor) {
-        $(waitFor(Cryptpad.addLoadingScreen));
+        $(waitFor(UI.addLoadingScreen));
         SFCommon.create(waitFor(function (c) { APP.common = common = c; }));
     }).nThen(function (waitFor) {
         sFrameChan = common.getSframeChannel();
         sFrameChan.onReady(waitFor());
     }).nThen(function (/*waitFor*/) {
-        Cryptpad.onError(function (info) {
-            if (info && info.type === "store") {
-                onConnectError();
-            }
-        });
-
         var toolbarElement = h('div#cp-toolbar.cp-toolbar-container');
 
         document.body.appendChild(toolbarElement);
@@ -71,10 +63,8 @@ define([
         var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle'];
         var configTb = {
             displayed: displayed,
-            common: Cryptpad,
             sfCommon: common,
             $container: $(toolbarElement),
-            network: Cryptpad.getNetwork(),
             pageTitle: Messages.contacts_title,
             metadataMgr: common.getMetadataMgr(),
         };
@@ -83,17 +73,17 @@ define([
 
         var messenger = Messenger.create(sFrameChan);
 
-        UI.create(messenger, $(friendList), $(messaging), common);
+        MessengerUI.create(messenger, $(friendList), $(messaging), common);
 
-        Cryptpad.removeLoadingScreen();
+        UI.removeLoadingScreen();
 
 /*
         sFrameChan.query('Q_HEY_BUDDY', null, function (err, data) {
             if (!data) { return; }
             if (data.error) {
-                Cryptpad.warn(data.error);
+                UI.warn(data.error);
             } else {
-                Cryptpad.log(data.response);
+                UI.log(data.response);
             }
         });*/
     });