Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

customize.dist/src/less/cryptpad.less

@@ -296,7 +296,7 @@ noscript {
         left: 0;
         bottom: 0;
         right: 0;
-        z-index: 2;
+        z-index: 2; // noscriptContainer
         #noscript {
             width: 1000px;
             display: flex;
@@ -341,7 +341,7 @@ noscript {
     left: 0;
     right: 0;
     margin: auto;
-    z-index: 1;
+    z-index: 1; // #main, #main_other
 
     font-size: medium;
 
@@ -607,7 +607,7 @@ noscript {
             background: blue;
             position: absolute;
             left: 0;
-            z-index:1;
+            z-index:1; // .usage
             &.normal {
                 background: @toolbar-green;
             }
@@ -622,7 +622,7 @@ noscript {
             position: relative;
             color: black;
             text-shadow: 1px 0 2px white, 0 1px 2px white, -1px 0 2px white, 0 -1px 2px white;
-            z-index: 2;
+            z-index: 2; // .usageText
             font-size: @main-font-size;
             font-weight: bold;
         }
@@ -644,7 +644,7 @@ noscript {
     bottom: 10vh;
     opacity: 0.9;
     box-sizing: border-box;
-    z-index: 10000;
+    z-index: 10000; // #uploadStatusContainer
     display: none;
     #uploadStatus {
         width: 80vw;
@@ -674,7 +674,7 @@ noscript {
             left: @upload_pad_v;
             top: @upload_pad_h; bottom: @upload_pad_h;
             background-color: rgba(0,0,255,0.3);
-            z-index: -1;
+            z-index: -1; // .progressContainer
         }
         .upCancel { text-align: center; }
         .fa.cancel {

customize.dist/src/less/toolbar.less

@@ -259,7 +259,7 @@ body .cryptpad-toolbar {
 
     font: @toolbar-button-font;
     width: 100%;
-    z-index: 9001;
+    z-index: 10000; // body, .cryptpad-toolbar
 
     .cp-dropdown-container {
         //height: 100%;
@@ -792,7 +792,7 @@ body .cryptpad-toolbar {
             cursor: pointer;
         }
         .cryptpad-user-dropdown {
-            z-index: 10000;
+            z-index: 10000; // .cryptpad-user-dropdown
             //margin-left: 20px;
             height: 64px;
             width: 64px;
@@ -915,7 +915,7 @@ body .cryptpad-toolbar {
         background: @dropdown-bg;
         display: flex;
         flex-flow: column;
-        z-index:10000;
+        z-index:10000; // .drawer-content
         color: black;
         .fa {
             font-size: 17px;

customize.dist/src/less2/include/alertify.less

@@ -64,7 +64,7 @@
         bottom: 0;
         width: 100%;
         height: 100%;
-        z-index: 99999; // alertify container
+        z-index: 100000; // alertify container
         &.forefront {
             z-index: @max-z-index; // alertify max forefront
         }

customize.dist/src/less2/include/dropdown.less

@@ -28,7 +28,7 @@
             background-color: @colortheme_dropdown-bg;
             min-width: 250px;
             box-shadow: 0px 1px 5px 0px rgba(0, 0, 0, 0.2);
-            z-index: 1000;
+            z-index: 1000; //Z dropdown content
             max-height: 300px;
             overflow-y: auto;
             font: @dropdown_font;

customize.dist/src/less2/include/fileupload.less

@@ -10,7 +10,7 @@
         bottom: 10vh;
         opacity: 0.9;
         box-sizing: border-box;
-        z-index: 1000000;
+        z-index: 1000000; //Z file upload table container
         display: none;
         #cp-fileupload-table {
             width: 80vw;
@@ -40,7 +40,7 @@
                 left: @upload_pad_v;
                 top: @upload_pad_h; bottom: @upload_pad_h;
                 background-color: rgba(0,0,255,0.3);
-                z-index: -1;
+                z-index: -1; //Z file upload progress container
             }
             .cp-fileupload-table-cancel { text-align: center; }
             .fa.cancel {

customize.dist/src/less2/include/infopages.less

@@ -117,7 +117,7 @@
 .infopages_topbar () {
     .cp-topbar {
         background: #fff;
-        z-index: 9001;
+        z-index: 10000; //Z infopage toolbar
         position: fixed;
         top: 0;
         display: flex;

customize.dist/src/less2/include/modal.less

@@ -20,7 +20,7 @@
 .cp-modal-container {
     display: none;
 
-    z-index: 100000;
+    z-index: 100000; //Z modal container
     position: absolute;
     top: 0;
     bottom: 0;

customize.dist/src/less2/include/toolbar.less

@@ -274,7 +274,7 @@
 
         font: @toolbar_button-font;
         width: 100%;
-        z-index: 9001;
+        z-index: 10000; // cp-toolbar
 
         .cp-dropdown-container {
             //height: 100%;
@@ -597,7 +597,7 @@
                 vertical-align: top;
             }
             .cp-toolbar-user-dropdown {
-                z-index: 10000;
+                z-index: 10000; //Z cp-toolbar-user-dropdown
                 //margin-left: 20px;
                 height: 64px;
                 width: 64px;
@@ -737,7 +737,7 @@
             background: @colortheme_dropdown-bg;
             display: flex;
             flex-flow: column;
-            z-index:10000;
+            z-index:10000; //Z cp-toolbar-drawer-content
             color: black;
             .fa {
                 font-size: 17px;

customize.dist/src/less2/loading.less

@@ -1,9 +1,14 @@
+/*
+WARNING: THIS FILE DOES NOTHING
+It exists only as a proposal of what CSS you should use in loading.js
+The CSS inside of loading.js is precompiled in order to save 200ish milliseconds to the loading screen.
+*/
 @import (once) "./include/colortheme.less";
 @import (once) "./include/browser.less";
 
 #cp-loading {
     position: fixed;
-    z-index: 9999999;
+    z-index: 10000000; // #loading
     top: 0px;
     bottom: 0px;
     left: 0px;
@@ -35,7 +40,7 @@
 }
 #cp-loading-tip {
     position: fixed;
-    z-index: 99999;
+    z-index: 100000; // loading tip
     top: 80%;
     left: 0;
     right: 0;

customize.dist/translations/messages.fr.js

@@ -177,7 +177,7 @@ define(function () {
     out.fileShare = "Copier le lien";
     out.getEmbedCode = "Obtenir le code d'intégration";
     out.viewEmbedTitle = "Intégrer le pad dans une page web";
-    out.viewEmbedTag = "Pour intégrer ce pad, veuillez inclure l'iframe suivant dans votre page là om vous souhaitez l'afficher. Vous pouvez changer sa taille en utilisant du code CSS ou des attributs HTML.";
+    out.viewEmbedTag = "Pour intégrer ce pad, veuillez inclure l'iframe suivant dans votre page là où vous souhaitez l'afficher. Vous pouvez changer sa taille en utilisant du code CSS ou des attributs HTML.";
     out.fileEmbedTitle = "Intégrer le fichier dans une page web";
     out.fileEmbedScript = "Pour intégrer un fichier, veuillez inclure le script suivant une fois dans votre page afin de pouvoir charger le Media Tag :";
     out.fileEmbedTag = "Ensuite vous pouvez placer ce Media Tag où vous souhaitez dans votre page pour l'intégrer :";

www/code/inner.html

@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/code/inner.js" data-main="/common/sframe-boot.js?ver=1.3" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/code/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
         #editor1 { display: none; }

www/common/LessLoader.js

@@ -25,7 +25,7 @@ define([
 
     var cacheGet = function (k, cb) {
         if (window.cryptpadCache) { return void window.cryptpadCache.get(k, cb); }
-        setTimeout(function () { cb(localStorage['LESS_CACHE|' + key + '|' + k]); })
+        setTimeout(function () { cb(localStorage['LESS_CACHE|' + key + '|' + k]); });
     };
     var cachePut = function (k, v, cb) {
         if (window.cryptpadCache) { return void window.cryptpadCache.put(k, v, cb); }

www/common/cryptpad-common.js

@@ -20,9 +20,10 @@ define([
     '/common/pinpad.js',
     '/customize/application_config.js',
     '/common/media-tag.js',
+    '/bower_components/nthen/index.js',
 ], function ($, Config, Messages, Store, Util, Hash, UI, History, UserList, Title, Metadata,
             Messaging, CodeMirror, Files, FileCrypto, Realtime, Clipboard,
-            Pinpad, AppConfig, MediaTag) {
+            Pinpad, AppConfig, MediaTag, Nthen) {
 
     // Configure MediaTags to use our local viewer
     if (MediaTag && MediaTag.PdfPlugin) {
@@ -2071,23 +2072,8 @@ define([
 
     return function (f) {
         if (initialized) {
-            return void window.setTimeout(function () {
+            return void setTimeout(function () { f(void 0, env); });
-                f(void 0, env);
-            });
         }
-        var block = 0;
-
-        var cb = function () {
-            block--;
-            if (!block) {
-                initialized = true;
-
-                updateLocalVersion();
-                common.addTooltips();
-                f(void 0, env);
-                if (typeof(window.onhashchange) === 'function') { window.onhashchange(); }
-            }
-        };
 
         if (sessionStorage[newPadNameKey]) {
             common.initialName = sessionStorage[newPadNameKey];
@@ -2097,7 +2083,6 @@ define([
             common.initialPath = sessionStorage[newPadPathKey];
             delete sessionStorage[newPadPathKey];
         }
-
         common.onFriendRequest = function (confirmText, cb) {
             common.confirm(confirmText, cb, null, true);
         };
@@ -2105,20 +2090,9 @@ define([
             common.log(data.logText);
         };
 
-        Store.ready(function (err, storeObj) {
+        var proxy;
-            store = common.store = env.store = storeObj;
+        var network;
-            common.addDirectMessageHandler(common);
+        var provideFeedback = function () {
-
-            var proxy = getProxy();
-            var network = getNetwork();
-
-            network.on('disconnect', function () {
-                Realtime.setConnectionState(false);
-            });
-            network.on('reconnect', function () {
-                Realtime.setConnectionState(true);
-            });
-
             if (Object.keys(proxy).length === 1) {
                 feedback("FIRST_APP_USE", true);
             }
@@ -2141,110 +2115,123 @@ define([
             }
             common.reportScreenDimensions();
             common.reportLanguage();
+        };
 
-            $(function() {
+        Nthen(function (waitFor) {
-                // Race condition : if document.body is undefined when alertify.js is loaded, Alertify
+            Store.ready(waitFor(function (err, storeObj) {
-                // won't work. We have to reset it now to make sure it uses a correct "body"
+                store = common.store = env.store = storeObj;
-                UI.Alertify.reset();
+                common.addDirectMessageHandler(common);
-                // clear any tooltips that might get hung
+                proxy = getProxy();
-                setInterval(function () { common.clearTooltips(); }, 5000);
+                network = getNetwork();
-
+                network.on('disconnect', function () {
-                // Load the new pad when the hash has changed
+                    Realtime.setConnectionState(false);
-                var oldHref  = document.location.href;
-                window.onhashchange = function () {
-                    var newHref = document.location.href;
-                    var parsedOld = parsePadUrl(oldHref).hashData;
-                    var parsedNew = parsePadUrl(newHref).hashData;
-                    if (parsedOld && parsedNew && (
-                          parsedOld.type !== parsedNew.type
-                          || parsedOld.channel !== parsedNew.channel
-                          || parsedOld.mode !== parsedNew.mode
-                          || parsedOld.key !== parsedNew.key)) {
-                        if (!parsedOld.channel) { oldHref = newHref; return; }
-                        document.location.reload();
-                        return;
-                    }
-                    if (parsedNew) {
-                        oldHref = newHref;
-                    }
-                };
-
-                if (PINNING_ENABLED && isLoggedIn()) {
-                    console.log("logged in. pads will be pinned");
-                    block++;
-
-                    Pinpad.create(network, proxy, function (e, call) {
-                        if (e) {
-                            console.error(e);
-                            return cb();
-                        }
-
-                        console.log('RPC handshake complete');
-                        rpc = common.rpc = env.rpc = call;
-
-                        common.getPinLimit(function (e, limit, plan, note) {
-                            if (e) { return void console.error(e); }
-                            common.account.limit = limit;
-                            localStorage.plan = common.account.plan = plan;
-                            common.account.note = note;
-                            cb();
-                        });
-
-                        common.arePinsSynced(function (err, yes) {
-                            if (!yes) {
-                                common.resetPins(function (err) {
-                                    if (err) {
-                                        console.error("Pin Reset Error");
-                                        return console.error(err);
-                                    }
-                                    console.log('RESET DONE');
-                                });
-                            }
-                        });
-                    });
-                } else if (PINNING_ENABLED) {
-                    console.log('not logged in. pads will not be pinned');
-                } else {
-                    console.log('pinning disabled');
-                }
-
-                block++;
-                require([
-                    '/common/rpc.js',
-                ], function (Rpc) {
-                    Rpc.createAnonymous(network, function (e, call) {
-                        if (e) {
-                            console.error(e);
-                            return void cb();
-                        }
-                        anon_rpc = common.anon_rpc = env.anon_rpc = call;
-                        cb();
-                    });
                 });
+                network.on('reconnect', function () {
+                    Realtime.setConnectionState(true);
+                });
+                provideFeedback();
+            }), common);
+        }).nThen(function (waitFor) {
+            $(waitFor());
+        }).nThen(function (waitFor) {
+            // Race condition : if document.body is undefined when alertify.js is loaded, Alertify
+            // won't work. We have to reset it now to make sure it uses a correct "body"
+            UI.Alertify.reset();
+            // clear any tooltips that might get hung
+            setInterval(function () { common.clearTooltips(); }, 5000);
 
-
+            // Load the new pad when the hash has changed
-                // Everything's ready, continue...
+            var oldHref  = document.location.href;
-                if($('#pad-iframe').length) {
+            window.onhashchange = function () {
-                    block++;
+                var newHref = document.location.href;
-                    var $iframe = $('#pad-iframe');
+                var parsedOld = parsePadUrl(oldHref).hashData;
-                    var iframe = $iframe[0];
+                var parsedNew = parsePadUrl(newHref).hashData;
-                    var iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
+                if (parsedOld && parsedNew && (
-                    if (iframeDoc.readyState === 'complete') {
+                      parsedOld.type !== parsedNew.type
-                        cb();
+                      || parsedOld.channel !== parsedNew.channel
-                        return;
+                      || parsedOld.mode !== parsedNew.mode
-                    }
+                      || parsedOld.key !== parsedNew.key)) {
-                    $iframe.load(cb);
+                    if (!parsedOld.channel) { oldHref = newHref; return; }
+                    document.location.reload();
                     return;
                 }
+                if (parsedNew) { oldHref = newHref; }
+            };
 
-                block++;
+            if (PINNING_ENABLED && isLoggedIn()) {
-                cb();
+                console.log("logged in. pads will be pinned");
+                var w0 = waitFor();
+                Pinpad.create(network, proxy, function (e, call) {
+                    if (e) {
+                        console.error(e);
+                        return w0();
+                    }
+
+                    console.log('RPC handshake complete');
+                    rpc = common.rpc = env.rpc = call;
+
+                    common.getPinLimit(function (e, limit, plan, note) {
+                        if (e) { return void console.error(e); }
+                        common.account.limit = limit;
+                        localStorage.plan = common.account.plan = plan;
+                        common.account.note = note;
+                        w0();
+                    });
+
+                    common.arePinsSynced(function (err, yes) {
+                        if (!yes) {
+                            common.resetPins(function (err) {
+                                if (err) {
+                                    console.error("Pin Reset Error");
+                                    return console.error(err);
+                                }
+                                console.log('RESET DONE');
+                            });
+                        }
+                    });
+                });
+            } else if (PINNING_ENABLED) {
+                console.log('not logged in. pads will not be pinned');
+            } else {
+                console.log('pinning disabled');
+            }
+
+            var w1 = waitFor();
+            require([
+                '/common/rpc.js',
+            ], function (Rpc) {
+                Rpc.createAnonymous(network, function (e, call) {
+                    if (e) {
+                        console.error(e);
+                        return void w1();
+                    }
+                    anon_rpc = common.anon_rpc = env.anon_rpc = call;
+                    w1();
+                });
             });
-        }, common);
+
+            // Everything's ready, continue...
+            if($('#pad-iframe').length) {
+                var w2 = waitFor();
+                var $iframe = $('#pad-iframe');
+                var iframe = $iframe[0];
+                var iframeDoc = iframe.contentDocument || iframe.contentWindow.document;
+                if (iframeDoc.readyState === 'complete') {
+                    return void w2();
+                }
+                $iframe.load(w2); //cb);
+            }
+        }).nThen(function () {
+            updateLocalVersion();
+            common.addTooltips();
+            f(void 0, env);
+            if (typeof(window.onhashchange) === 'function') { window.onhashchange(); }
+        });
     };
 
     }());
 
+    // MAGIC that happens implicitly
     $(function () {
         Messages._applyTranslation();
     });

www/common/loading.js

@@ -1,11 +1,73 @@
-define([
+define([], function () {
-    'less!/bower_components/components-font-awesome/css/font-awesome.min.css',
+    var loadingStyle = (function(){/*
-    'less!/customize/src/less2/loading.less'
+#cp-loading {
-], function () {
+  position: fixed;
+  z-index: 10000000;
+  top: 0px;
+  bottom: 0px;
+  left: 0px;
+  right: 0px;
+  background: #222;
+  color: #fafafa;
+  text-align: center;
+  font-size: 1.5em;
+}
+#cp-loading .cp-loading-container {
+  margin-top: 50vh;
+  transform: translateY(-50%);
+}
+#cp-loading .cp-loading-cryptofist {
+  margin-left: auto;
+  margin-right: auto;
+  height: 300px;
+  margin-bottom: 2em;
+}
+@media screen and (max-height: 450px) {
+  #cp-loading .cp-loading-cryptofist {
+    display: none;
+  }
+}
+#cp-loading .cp-loading-spinner-container {
+  position: relative;
+  height: 100px;
+}
+#cp-loading .cp-loading-spinner-container > div {
+  height: 100px;
+}
+#cp-loading-tip {
+  position: fixed;
+  z-index: 100000;
+  top: 80%;
+  left: 0;
+  right: 0;
+  text-align: center;
+  transition: opacity 750ms;
+  transition-delay: 3000ms;
+}
+@media screen and (max-height: 600px) {
+  #cp-loading-tip {
+    display: none;
+  }
+}
+#cp-loading-tip span {
+  background: #222;
+  color: #fafafa;
+  text-align: center;
+  font-size: 1.5em;
+  opacity: 0.7;
+  font-family: 'Open Sans', 'Helvetica Neue', sans-serif;
+  padding: 15px;
+  max-width: 60%;
+  display: inline-block;
+}
+*/}).toString().slice(14, -3);
     var urlArgs = window.location.href.replace(/^.*\?([^\?]*)$/, function (all, x) { return x; });
     var elem = document.createElement('div');
     elem.setAttribute('id', 'cp-loading');
     elem.innerHTML = [
+        '<style>',
+        loadingStyle,
+        '</style>',
         '<div class="cp-loading-container">',
             '<img class="cp-loading-cryptofist" src="/customize/cryptpad-new-logo-colors-logoonly.png?' + urlArgs + '">',
             '<div class="cp-loading-spinner-container">',

www/common/sframe-boot.js

@@ -2,36 +2,10 @@
 // Note that this file is meant to be executed only inside of a sandbox iframe.
 //
 // IF YOU EDIT THIS FILE, bump the version (replace 1.3 in the following command with the next version.)
-// grep -nr '/common/sframe-boot.js?ver=' | sed 's/:.*$//' | while read x; do \
+// grep -nr '/common/sframe-boot.js?ver=' | sed 's/:.*$//' | grep -v 'sframe-boot.js' | while read x; do \
 //    sed -i -e 's@/common/sframe-boot.js?ver=[^"]*@/common/sframe-boot.js?ver=1.3@' $x; done
 ;(function () {
 var afterLoaded = function (req) {
-    var localStorage = {};
-    if (req.cfg && req.cfg.urlArgs) {
-        try {
-            localStorage = window.localStorage;
-            if (localStorage['CRYPTPAD_VERSION'] !== req.cfg.urlArgs) {
-                // new version, flush
-                Object.keys(localStorage).forEach(function (k) {
-                    if (!k.indexOf('CRYPTPAD_CACHE_')) { delete localStorage[k]; }
-                });
-                localStorage['CRYPTPAD_VERSION'] = req.cfg.urlArgs;
-            }
-        } catch (e) {
-            console.error(e);
-            localStorage = {};
-        }
-    }
-    window.cryptpadCache = Object.freeze({
-        put: function (k, v, cb) {
-            cb = cb || function () { };
-            setTimeout(function () { localStorage['CRYPTPAD_CACHE_' + k] = v; cb(); });
-        },
-        get: function (k, cb) {
-            if (!cb) { throw new Error(); }
-            setTimeout(function () { cb(localStorage['CRYPTPAD_CACHE_' + k]); });
-        }
-    });
     req.cfg = req.cfg || {};
     if (req.pfx) {
         req.cfg.onNodeCreated = function (node /*, config, module, path*/) {
@@ -54,17 +28,34 @@ var afterLoaded = function (req) {
         clearInterval(intr);
         txid = {};
         window.removeEventListener('message', onReply);
+        data.cache = data.cache || {};
+        var updated = {};
+        window.cryptpadCache = {
+            get: function (k, cb) {
+                setTimeout(function () { cb(data.cache[k]); });
+            },
+            put: function (k, v, cb) {
+                cb = cb || function () { };
+                updated[k] = v;
+                setTimeout(function () { data.cache[k] = v; cb(); });
+            },
+            updated: updated,
+            cache: data.cache
+        };
         require(['/common/sframe-boot2.js'], function () { });
     };
     window.addEventListener('message', onReply);
 };
 
-var intr = setInterval(function () {
+var load0 = function () {
     try {
         var req = JSON.parse(decodeURIComponent(window.location.hash.substring(1)));
-        clearInterval(intr);
         afterLoaded(req);
-    } catch (e) { console.error(e); }
+    } catch (e) {
-}, 100);
+        console.error(e);
+        setTimeout(load0, 100);
+    }
+};
+load0();
 
 }());

www/common/sframe-boot2.js

@@ -20,5 +20,7 @@ define(['/common/requireconfig.js'], function (RequireConfig) {
     window.__defineGetter__('localStorage', function () { return mkFakeStore(); });
     window.__defineGetter__('sessionStorage', function () { return mkFakeStore(); });
 
+    window.CRYPTPAD_INSIDE = true;
+
     require([document.querySelector('script[data-bootload]').getAttribute('data-bootload')]);
 });

www/common/sframe-channel.js

@@ -8,7 +8,7 @@ define([
         return Math.random().toString(16).replace('0.', '') + Math.random().toString(16).replace('0.', '');
     };
 
-    var create = function (ow, cb, isSandbox) {
+    var create = function (ow, cb, isSandbox, sendData) {
         var otherWindow;
         var evReady = Util.mkEvent(true);
         var handlers = {};
@@ -47,7 +47,6 @@ define([
 
         // Fire an event.  channel.event('EV_SOMETHING', { args: "whatever" });
         var event = chan.event = function (e, content) {
-            if (!otherWindow) { throw new Error('not yet initialized'); }
             if (!SFrameProtocol[e]) {
                 throw new Error('please only fire events that are defined in sframe-protocol.js');
             }
@@ -63,7 +62,6 @@ define([
         // If the type is a query, your handler will be invoked with a reply function that takes
         // one argument (the content to reply with).
         chan.on = function (queryType, handler, quiet) {
-            if (!otherWindow && !quiet) { throw new Error('not yet initialized'); }
             if (!SFrameProtocol[queryType]) {
                 throw new Error('please only register handlers which are defined in sframe-protocol.js');
             }
@@ -85,7 +83,6 @@ define([
         // when that handler is first registered.
         // channel.whenReg('Q_SOMETHING', function () { ...query Q_SOMETHING?... });
         chan.whenReg = function (queryType, cb, always) {
-            if (!otherWindow) { throw new Error('not yet initialized'); }
             if (!SFrameProtocol[queryType]) {
                 throw new Error('please only register handlers which are defined in sframe-protocol.js');
             }
@@ -109,7 +106,8 @@ define([
                 delete callWhenRegistered[content];
             }
             insideHandlers.push(content);
-        }, true);
+        });
+        chan.whenReg('EV_REGISTER_HANDLER', evReady.fire);
 
         // Make sure both iframes are ready
         chan.onReady = function (h) {
@@ -131,8 +129,9 @@ define([
                 //console.log(msg);
             } else if (!otherWindow) {
                 otherWindow = ow;
-                evReady.fire();
+                sendData = sendData || {};
-                ow.postMessage(JSON.stringify({ txid: data.txid }), '*');
+                sendData.txid = data.txid;
+                ow.postMessage(JSON.stringify(sendData), '*');
                 cb(chan);
             } else if (typeof(data.q) === 'string' && handlers[data.q]) {
                 handlers[data.q].forEach(function (f) {

www/common/sframe-common-outer.js

@@ -34,12 +34,34 @@ define([
                 Crypto = _Crypto;
                 Cryptget = _Cryptget;
                 FilePicker = _FilePicker;
+
+                if (localStorage.CRYPTPAD_URLARGS !== ApiConfig.requireConf.urlArgs) {
+                    console.log("New version, flushing cache");
+                    Object.keys(localStorage).forEach(function (k) {
+                        if (k.indexOf('CRYPTPAD_CACHE|') !== 0) { return; }
+                        delete localStorage[k];
+                    });
+                    localStorage.CRYPTPAD_URLARGS = ApiConfig.requireConf.urlArgs;
+                }
+                var cache = {};
+                Object.keys(localStorage).forEach(function (k) {
+                    if (k.indexOf('CRYPTPAD_CACHE|') !== 0) { return; }
+                    cache[k.slice(('CRYPTPAD_CACHE|').length)] = localStorage[k];
+                });
+
                 SFrameChannel.create($('#sbox-iframe')[0].contentWindow, waitFor(function (sfc) {
                     sframeChan = sfc;
-                }));
+                }), false, { cache: cache });
                 Cryptpad.ready(waitFor());
             }));
         }).nThen(function (waitFor) {
+
+            sframeChan.on('EV_CACHE_PUT', function (x) {
+                Object.keys(x).forEach(function (k) {
+                    localStorage['CRYPTPAD_CACHE|' + k] = x[k];
+                });
+            });
+
             secret = Cryptpad.getSecrets();
             if (!secret.channel) {
                 // New pad: create a new random channel id

www/common/sframe-common.js

@@ -271,6 +271,19 @@ define([
         }).nThen(function () {
             ctx.metadataMgr = MetadataMgr.create(ctx.sframeChan);
 
+            ctx.sframeChan.whenReg('EV_CACHE_PUT', function () {
+                if (Object.keys(window.cryptpadCache.updated).length) {
+                    ctx.sframeChan.event('EV_CACHE_PUT', window.cryptpadCache.updated);
+                }
+                window.cryptpadCache._put = window.cryptpadCache.put;
+                window.cryptpadCache.put = function (k, v, cb) {
+                    window.cryptpadCache._put(k, v, cb);
+                    var x = {};
+                    x[k] = v;
+                    ctx.sframeChan.event('EV_CACHE_PUT', x);
+                };
+            });
+
             UI.addTooltips();
 
             ctx.sframeChan.on('EV_RT_CONNECT', function () { CommonRealtime.setConnectionState(true); });

www/common/sframe-protocol.js

@@ -127,4 +127,7 @@ define({
     // Present mode URL
     'Q_PRESENT_URL_GET_VALUE': true,
     'EV_PRESENT_URL_SET_VALUE': true,
+
+    // Put one or more entries to the cache which will go in localStorage.
+    'EV_CACHE_PUT': true,
 });

www/file/inner.html

@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/file/inner.js" data-main="/common/sframe-boot.js?ver=1.3" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/file/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
         #editor1 { display: none; }

www/filepicker/inner.html

@@ -2,7 +2,7 @@
 <html style="height: 100%; background: transparent;">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/filepicker/inner.js" data-main="/common/sframe-boot.js?ver=1.3" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/filepicker/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
         body #cp-loading {

www/pad/inner.html

@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/pad/inner.js" data-main="/common/sframe-boot.js?ver=1.3" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/pad/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
 </head>
 <body class="cp-app-pad">
     <textarea style="display:none" id="editor1" name="editor1"></textarea>

www/slide/inner.html

@@ -2,7 +2,7 @@
 <html class="cp-app-noscroll cp-app-print">
 <head>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
-    <script async data-bootload="/slide/inner.js" data-main="/common/sframe-boot.js?ver=1.3" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
+    <script async data-bootload="/slide/inner.js" data-main="/common/sframe-boot.js?ver=1.4" src="/bower_components/requirejs/require.js?ver=2.3.5"></script>
     <style>
         .loading-hidden { display: none; }
         #editor1 { display: none; }