From 8b702e0150a24f40cafb4f0ba2d8c9268cd88504 Mon Sep 17 00:00:00 2001
From: Caleb James DeLisle <cjd@cjdns.fr>
Date: Mon, 21 Aug 2017 10:34:49 +0200
Subject: [PATCH] wip

---
 www/common/loading.js             |  31 +++++
 www/common/requireconfig.js       |   2 +-
 www/common/sframe-boot.js         |   7 +-
 www/common/sframe-common-title.js |   5 +-
 www/pad2/index.html               |   4 +-
 www/pad2/inner.html               |   2 +-
 www/pad2/outer.js                 | 190 ++++++++++++++++--------------
 7 files changed, 142 insertions(+), 99 deletions(-)
 create mode 100644 www/common/loading.js

diff --git a/www/common/loading.js b/www/common/loading.js
new file mode 100644
index 000000000..a1693d2c1
--- /dev/null
+++ b/www/common/loading.js
@@ -0,0 +1,31 @@
+define([
+    'less!/customize/src/less/cryptpad.less'
+], function () {
+    var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
+    var elem = document.createElement('div');
+    elem.setAttribute('id', 'loading');
+    elem.innerHTML = [
+        '<div class="loadingContainer">',
+            '<img class="cryptofist" src="/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs + '">',
+            '<div class="spinnerContainer">',
+                '<span class="fa fa-circle-o-notch fa-spin fa-4x fa-fw"></span>',
+            '</div>',
+            '<p id="cp-loading-message"></p>',
+        '</div>'
+    ].join('');
+    var intr;
+    var append = function () {
+        if (!document.body) { return; }
+        clearInterval(intr);
+        document.body.appendChild(elem);
+        require([
+            '/customize/messages.js',
+
+            'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
+        ], function (Messages) {
+            document.getElementById('cp-loading-message').innerText = Messages.loading;
+        });
+    };
+    intr = setInterval(append, 100);
+    append();
+});
\ No newline at end of file
diff --git a/www/common/requireconfig.js b/www/common/requireconfig.js
index 2571b24e5..caa0da868 100644
--- a/www/common/requireconfig.js
+++ b/www/common/requireconfig.js
@@ -4,7 +4,7 @@ define([
     var out = {
         // fix up locations so that relative urls work.
         baseUrl: window.location.pathname,
-        paths: {
+        paths: { 
             // jquery declares itself as literally "jquery" so it cannot be pulled by path :(
             "jquery": "/bower_components/jquery/dist/jquery.min",
             // json.sortify same
diff --git a/www/common/sframe-boot.js b/www/common/sframe-boot.js
index 190055682..e0182beaf 100644
--- a/www/common/sframe-boot.js
+++ b/www/common/sframe-boot.js
@@ -1,9 +1,14 @@
 // Stage 0, this gets cached which means we can't change it. boot2-sframe.js is changable.
 // Note that this file is meant to be executed only inside of a sandbox iframe.
+;(function () {
 window.addEventListener('message', function (msg) {
     var data = JSON.parse(msg.data);
     if (data.q !== 'INIT') { return; }
     msg.source.postMessage(JSON.stringify({ txid: data.txid, content: 'OK' }), '*');
     if (data.content && data.content.requireConf) { require.config(data.content.requireConf); }
     require(['/common/sframe-boot2.js'], function () { });
-});
\ No newline at end of file
+});
+var req = JSON.parse(decodeURIComponent(window.location.hash.substring(1)));
+if (req.cfg) { require.config(req.cfg); }
+if (req.req) { require(req.req, function () { }); }
+}());
\ No newline at end of file
diff --git a/www/common/sframe-common-title.js b/www/common/sframe-common-title.js
index 545e80d51..066f0328c 100644
--- a/www/common/sframe-common-title.js
+++ b/www/common/sframe-common-title.js
@@ -49,10 +49,7 @@ define(['jquery'], function ($) {
         exp.updateTitle = function (newTitle, cb) {
             cb = cb || $.noop;
             if (newTitle === exp.title) { return; }
-            // Change the title now, and set it back to the old value if there is an error
-            //var oldTitle = exp.title;
-            Common.updateTitle(newTitle, cb)
-            //cb(null, newTitle);
+            Common.updateTitle(newTitle, cb);
         };
 
         // TODO not needed?
diff --git a/www/pad2/index.html b/www/pad2/index.html
index 4e21fbe18..7f6236a5f 100644
--- a/www/pad2/index.html
+++ b/www/pad2/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html class="cp pad">
+<html>
 <head>
     <title>CryptPad</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
@@ -27,4 +27,4 @@
     </style>
 </head>
 <body>
-<iframe id="sbox-iframe"></iframe>
+<iframe id="sbox-iframe">
\ No newline at end of file
diff --git a/www/pad2/inner.html b/www/pad2/inner.html
index 2e528c49b..47161ffa8 100644
--- a/www/pad2/inner.html
+++ b/www/pad2/inner.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="cp pad">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
diff --git a/www/pad2/outer.js b/www/pad2/outer.js
index 017736025..a17813b66 100644
--- a/www/pad2/outer.js
+++ b/www/pad2/outer.js
@@ -1,103 +1,113 @@
-
 define([
     '/api/config',
-    '/common/sframe-channel.js',
     'jquery',
-    '/common/sframe-chainpad-netflux-outer.js',
-    '/bower_components/nthen/index.js',
-    '/common/cryptpad-common.js',
-    '/bower_components/chainpad-crypto/crypto.js'
-], function (ApiConfig, SFrameChannel, $, CpNfOuter, nThen, Cryptpad, Crypto) {
-    console.log('xxx');
-    var sframeChan;
-    nThen(function (waitFor) {
-        $(waitFor());
-    }).nThen(function (waitFor) {
+    '/common/requireconfig.js'
+], function (ApiConfig, $, RequireConfig) {
+    $(function () {
+        var req = {
+            cfg: RequireConfig,
+            req: [ '/common/loading.js' ],
+        };
         $('#sbox-iframe').attr('src',
-            ApiConfig.httpSafeOrigin + '/pad2/inner.html?' + ApiConfig.requireConf.urlArgs);
-        SFrameChannel.create($('#sbox-iframe')[0].contentWindow, waitFor(function (sfc) {
-            sframeChan = sfc;
-            console.log('sframe initialized');
-        }));
-        Cryptpad.ready(waitFor());
-    }).nThen(function (waitFor) {
-        var secret = Cryptpad.getSecrets();
-        var readOnly = secret.keys && !secret.keys.editKeyStr;
-        if (!secret.keys) { secret.keys = secret.key; }
-        
-        var parsed = Cryptpad.parsePadUrl(window.location.href);
-        parsed.type = parsed.type.replace('pad2', 'pad');
-        if (!parsed.type) { throw new Error(); }
-        var defaultTitle = Cryptpad.getDefaultName(parsed);
-        var updateMeta = function () {
-            //console.log('EV_METADATA_UPDATE');
-            var name;
-            nThen(function (waitFor) {
-                Cryptpad.getLastName(waitFor(function (err, n) {
-                    if (err) { console.log(err); }
-                    name = n;
-                }));
-            }).nThen(function (waitFor) {
-                sframeChan.event('EV_METADATA_UPDATE', {
-                    doc: {
-                        defaultTitle: defaultTitle,
-                        type: parsed.type
-                    },
-                    user: {
-                        name: name,
-                        uid: Cryptpad.getUid(),
-                        avatar: Cryptpad.getAvatarUrl(),
-                        profile: Cryptpad.getProfileUrl(),
-                        curvePublic: Cryptpad.getProxy().curvePublic,
-                        netfluxId: Cryptpad.getNetwork().webChannels[0].myID,
-                    },
-                    priv: {
-                        accountName: Cryptpad.getAccountName()
-                    }
+            ApiConfig.httpSafeOrigin + '/pad2/inner.html?' + ApiConfig.requireConf.urlArgs +
+                '#' + encodeURIComponent(JSON.stringify(req)));
+    });
+    require([
+        '/common/sframe-channel.js',
+        '/common/sframe-chainpad-netflux-outer.js',
+        '/bower_components/nthen/index.js',
+        '/common/cryptpad-common.js',
+        '/bower_components/chainpad-crypto/crypto.js'
+    ], function (SFrameChannel, CpNfOuter, nThen, Cryptpad, Crypto) {
+        console.log('xxx');
+        var sframeChan;
+        nThen(function (waitFor) {
+            $(waitFor());
+        }).nThen(function (waitFor) {
+            SFrameChannel.create($('#sbox-iframe')[0].contentWindow, waitFor(function (sfc) {
+                sframeChan = sfc;
+                console.log('sframe initialized');
+            }));
+            Cryptpad.ready(waitFor());
+        }).nThen(function (waitFor) {
+            var secret = Cryptpad.getSecrets();
+            var readOnly = secret.keys && !secret.keys.editKeyStr;
+            if (!secret.keys) { secret.keys = secret.key; }
+            
+            var parsed = Cryptpad.parsePadUrl(window.location.href);
+            parsed.type = parsed.type.replace('pad2', 'pad');
+            if (!parsed.type) { throw new Error(); }
+            var defaultTitle = Cryptpad.getDefaultName(parsed);
+            var updateMeta = function () {
+                //console.log('EV_METADATA_UPDATE');
+                var name;
+                nThen(function (waitFor) {
+                    Cryptpad.getLastName(waitFor(function (err, n) {
+                        if (err) { console.log(err); }
+                        name = n;
+                    }));
+                }).nThen(function (waitFor) {
+                    sframeChan.event('EV_METADATA_UPDATE', {
+                        doc: {
+                            defaultTitle: defaultTitle,
+                            type: parsed.type
+                        },
+                        user: {
+                            name: name,
+                            uid: Cryptpad.getUid(),
+                            avatar: Cryptpad.getAvatarUrl(),
+                            profile: Cryptpad.getProfileUrl(),
+                            curvePublic: Cryptpad.getProxy().curvePublic,
+                            netfluxId: Cryptpad.getNetwork().webChannels[0].myID,
+                        },
+                        priv: {
+                            accountName: Cryptpad.getAccountName()
+                        }
+                    });
+                });
+            };
+            Cryptpad.onDisplayNameChanged(updateMeta);
+            sframeChan.onReg('EV_METADATA_UPDATE', updateMeta);
+
+            Cryptpad.onError(function (info) {
+                console.log('error');
+                console.log(info);
+                if (info && info.type === "store") {
+                    //onConnectError();
+                }
+            });
+
+            sframeChan.on('Q_SET_PAD_TITLE_IN_DRIVE', function (newTitle, cb) {
+                Cryptpad.renamePad(newTitle, undefined, function (err) {
+                    if (err) { cb('ERROR'); } else { cb(); }
                 });
             });
-        };
-        Cryptpad.onDisplayNameChanged(updateMeta);
-        sframeChan.onReg('EV_METADATA_UPDATE', updateMeta);
 
-        Cryptpad.onError(function (info) {
-            console.log('error');
-            console.log(info);
-            if (info && info.type === "store") {
-                //onConnectError();
-            }
-        });
-
-        sframeChan.on('Q_SET_PAD_TITLE_IN_DRIVE', function (newTitle, cb) {
-            Cryptpad.renamePad(newTitle, undefined, function (err) {
-                if (err) { cb('ERROR'); } else { cb(); }
+            sframeChan.on('Q_SETTINGS_SET_DISPLAY_NAME', function (newName, cb) {
+                Cryptpad.setAttribute('username', newName, function (err) {
+                    if (err) {
+                        console.log("Couldn't set username");
+                        console.error(err);
+                        cb('ERROR');
+                        return;
+                    }
+                    Cryptpad.changeDisplayName(newName, true);
+                    cb();
+                });
             });
-        });
 
-        sframeChan.on('Q_SETTINGS_SET_DISPLAY_NAME', function (newName, cb) {
-            Cryptpad.setAttribute('username', newName, function (err) {
-                if (err) {
-                    console.log("Couldn't set username");
-                    console.error(err);
-                    cb('ERROR');
-                    return;
+            CpNfOuter.start({
+                sframeChan: sframeChan,
+                channel: secret.channel,
+                network: Cryptpad.getNetwork(),
+                validateKey: secret.keys.validateKey || undefined,
+                readOnly: readOnly,
+                crypto: Crypto.createEncryptor(secret.keys),
+                onConnect: function (wc) {
+                    if (readOnly) { return; }
+                    Cryptpad.replaceHash(Cryptpad.getEditHashFromKeys(wc.id, secret.keys));
                 }
-                Cryptpad.changeDisplayName(newName, true);
-                cb();
             });
         });
-
-        CpNfOuter.start({
-            sframeChan: sframeChan,
-            channel: secret.channel,
-            network: Cryptpad.getNetwork(),
-            validateKey: secret.keys.validateKey || undefined,
-            readOnly: readOnly,
-            crypto: Crypto.createEncryptor(secret.keys),
-            onConnect: function (wc) {
-                if (readOnly) { return; }
-                Cryptpad.replaceHash(Cryptpad.getEditHashFromKeys(wc.id, secret.keys));
-            }
-        });
     });
-});
+});
\ No newline at end of file