Merge branch 'staging' into modern-users2

server.js

@@ -165,7 +165,7 @@ app.get('/api/config', function(req, res){
     res.send('define(function(){\n' + [
         'var obj = ' + JSON.stringify({
             requireConf: {
-                waitSeconds: 60,
+                waitSeconds: 600,
                 urlArgs: 'ver=' + Package.version + (FRESH_KEY? '-' + FRESH_KEY: '') + (DEV_MODE? '-' + (+new Date()): ''),
             },
             removeDonateButton: (config.removeDonateButton === true),

www/common/sframe-common-outer.js

@@ -188,13 +188,13 @@ define([
 
                         if (val) {
                             password = val;
-                            Cryptpad.getFileSize(window.location.href, password, function (e, size) {
+                            Cryptpad.getFileSize(window.location.href, password, waitFor(function (e, size) {
                                 if (size !== 0) {
                                     return void todo();
                                 }
                                 // Wrong password or deleted file?
                                 askPassword(true);
-                            });
+                            }));
                         } else {
                             askPassword();
                         }

www/common/userObject.js

@@ -37,7 +37,14 @@ define([
         var logError = config.logError || logging;
         var debug = exp.debug = config.debug || logging;
         var error = exp.error = function() {
-            exp.fixFiles();
+            if (sframeChan) {
+                return void sframeChan.query("Q_DRIVE_USEROBJECT", {
+                    cmd: "fixFiles",
+                    data: {}
+                }, function () {});
+            } else if (typeof (exp.fixFiles) === "function") {
+                exp.fixFiles();
+            }
             console.error.apply(console, arguments);
         };