resolve merge conflicts

www/filepicker/app-filepicker.less

@@ -50,6 +50,7 @@
             img {
                 max-width: 100px;
                 max-height: 100px;
+                background: #fff;
             }
 
             .cp-filepicker-content-element-name {

www/filepicker/inner.js

@@ -1,10 +1,14 @@
 define([
     'jquery',
     '/bower_components/chainpad-crypto/crypto.js',
-    '/common/cryptpad-common.js',
     '/bower_components/nthen/index.js',
     '/common/sframe-common.js',
+    '/common/common-interface.js',
+    '/common/common-ui-elements.js',
+    '/common/common-util.js',
+    '/common/common-hash.js',
     'json.sortify',
+    '/customize/messages.js',
 
     'css!/bower_components/bootstrap/dist/css/bootstrap.min.css',
     'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
@@ -12,20 +16,16 @@ define([
 ], function (
     $,
     Crypto,
-    Cryptpad,
     nThen,
     SFCommon,
-    Sortify)
+    UI,
+    UIElements,
+    Util,
+    Hash,
+    Sortify,
+    Messages)
 {
-    var Messages = Cryptpad.Messages;
-
-    var APP = window.APP = {
-        Cryptpad: Cryptpad,
-    };
-
-    var onConnectError = function () {
-        Cryptpad.errorLoadingScreen(Messages.websocketError);
-    };
+    var APP = window.APP = {};
 
     var andThen = function (common) {
         var metadataMgr = common.getMetadataMgr();
@@ -37,10 +37,10 @@ define([
             sframeChan.event('EV_FILE_PICKER_CLOSE');
         };
         var onFilePicked = function (data) {
-            var parsed = Cryptpad.parsePadUrl(data.url);
+            var parsed = Hash.parsePadUrl(data.url);
             hideFileDialog();
             if (parsed.type === 'file') {
-                var hexFileName = Cryptpad.base64ToHex(parsed.hashData.channel);
+                var hexFileName = Util.base64ToHex(parsed.hashData.channel);
                 var src = '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName;
                 sframeChan.event("EV_FILE_PICKED", {
                     type: parsed.type,
@@ -76,7 +76,7 @@ define([
         var createFileDialog = function () {
             var types = filters.types || [];
             // Create modal
-            var $blockContainer = Cryptpad.createModal({
+            var $blockContainer = UIElements.createModal({
                 id: 'cp-filepicker-dialog',
                 $body: $body,
                 onClose: hideFileDialog
@@ -128,7 +128,7 @@ define([
                             'class': 'cp-filepicker-content-element',
                             'title': name,
                         }).appendTo($container);
-                        $span.append(Cryptpad.getFileIcon(data));
+                        $span.append(UI.getFileIcon(data));
                         $('<span>', {'class': 'cp-filepicker-content-element-name'}).text(name)
                             .appendTo($span);
                         $span.click(function () {
@@ -145,8 +145,6 @@ define([
             updateContainer();
         };
         sframeChan.on('EV_FILE_PICKER_REFRESH', function (newFilters) {
-            console.log(Sortify(filters));
-            console.log(Sortify(newFilters));
             if (Sortify(filters) !== Sortify(newFilters)) {
                 $body.html('');
                 filters = newFilters;
@@ -156,7 +154,7 @@ define([
         });
         createFileDialog();
 
-        Cryptpad.removeLoadingScreen();
+        UI.removeLoadingScreen();
     };
 
     var main = function () {
@@ -164,16 +162,11 @@ define([
 
         nThen(function (waitFor) {
             $(waitFor(function () {
-                Cryptpad.addLoadingScreen({hideTips: true, hideLogo: true});
+                UI.addLoadingScreen({hideTips: true, hideLogo: true});
             }));
             SFCommon.create(waitFor(function (c) { APP.common = common = c; }));
         }).nThen(function (/*waitFor*/) {
             var metadataMgr = common.getMetadataMgr();
-            Cryptpad.onError(function (info) {
-                if (info && info.type === "store") {
-                    onConnectError();
-                }
-            });
             if (metadataMgr.getMetadataLazy() !== 'uninitialized') {
                 andThen(common);
                 return;

www/filepicker/main.js

@@ -38,25 +38,13 @@ define([
             window.addEventListener('message', onMsg);
         }).nThen(function (/*waitFor*/) {
             var Cryptpad;
-            var Crypto;
-            var Cryptget;
 
             nThen(function (waitFor) {
-                // Load #2, the loading screen is up so grab whatever you need...
-                require([
-                    '/common/cryptpad-common.js',
-                    '/bower_components/chainpad-crypto/crypto.js',
-                    '/common/cryptget.js',
-                    '/common/sframe-channel.js',
-                ], waitFor(function (_Cryptpad, _Crypto, _Cryptget, SFrameChannel) {
-                    Cryptpad = _Cryptpad;
-                    Crypto = _Crypto;
-                    Cryptget = _Cryptget;
-                    SFrameChannel.create($('#sbox-filePicker-iframe')[0].contentWindow, waitFor(function (sfc) {
+                Cryptpad = config.modules.Cryptpad;
+                config.modules.SFrameChannel.create($('#sbox-filePicker-iframe')[0].contentWindow,
+                    waitFor(function (sfc) {
                         sframeChan = sfc;
                     }));
-                    Cryptpad.ready(waitFor());
-                }));
             }).nThen(function () {
                 var proxy = Cryptpad.getProxy();
                 var updateMeta = function () {
@@ -94,29 +82,7 @@ define([
                 sframeChan.onReg('EV_METADATA_UPDATE', updateMeta);
                 proxy.on('change', 'settings', updateMeta);
 
-                Cryptpad.onError(function (info) {
-                    console.log('error');
-                    console.log(info);
-                    if (info && info.type === "store") {
-                        //onConnectError();
-                    }
-                });
-
-                sframeChan.on('Q_ANON_RPC_MESSAGE', function (data, cb) {
-                    Cryptpad.anonRpcMsg(data.msg, data.content, function (err, response) {
-                        cb({error: err, response: response});
-                    });
-                });
-
-                sframeChan.on('Q_GET_PIN_LIMIT_STATUS', function (data, cb) {
-                    Cryptpad.isOverPinLimit(function (e, overLimit, limits) {
-                        cb({
-                            error: e,
-                            overLimit: overLimit,
-                            limits: limits
-                        });
-                    });
-                });
+                config.addCommonRpc(sframeChan);
 
                 sframeChan.on('Q_GET_FILES_LIST', function (types, cb) {
                     console.error("TODO: make sure Q_GET_FILES_LIST is only available from filepicker");