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

www/assert/main.js

@@ -137,7 +137,8 @@ define([
         var secret = Hash.parsePadUrl('/pad/#67b8385b07352be53e40746d2be6ccd7XAYSuJYYqa9NfmInyHci7LNy');
         return cb(secret.hashData.channel === "67b8385b07352be53e40746d2be6ccd7" &&
             secret.hashData.key === "XAYSuJYYqa9NfmInyHci7LNy" &&
-            secret.hashData.version === 0);
+            secret.hashData.version === 0 &&
+            typeof(secret.hashData.getURL) === 'function');
     }, "Old hash failed to parse");
 
     // make sure version 1 hashes parse correctly

www/common/cryptpad-common.js

@@ -4,18 +4,17 @@ define([
     '/common/common-util.js',
     '/common/common-hash.js',
     '/common/common-messaging.js',
-    '/common/common-realtime.js',
     '/common/common-constants.js',
     '/common/common-feedback.js',
     '/common/outer/local-store.js',
     '/common/outer/store-rpc.js',
 
-    '/common/pinpad.js',
     '/customize/application_config.js',
     '/bower_components/nthen/index.js',
 ], function (Config, Messages, Util, Hash,
-            Messaging, Realtime, Constants, Feedback, LocalStore, AStore,
-            Pinpad, AppConfig, Nthen) {
+            Messaging, Constants, Feedback, LocalStore, AStore,
+            AppConfig, Nthen) {
+
 
 /*  This file exposes functionality which is specific to Cryptpad, but not to
     any particular pad type. This includes functions for committing metadata

www/common/sframe-app-framework.js

@@ -253,6 +253,13 @@ define([
                 newContent = normalize(newContent);
                 contentUpdate(newContent);
             } else {
+                if (!cpNfInner.metadataMgr.getPrivateData().isNewFile) {
+                    // We're getting 'new pad' but there is an existing file
+                    // We don't know exactly why this can happen but under no circumstances
+                    // should we overwrite the content, so lets just try again.
+                    common.gotoURL();
+                    return;
+                }
                 console.log('updating title');
                 title.updateTitle(title.defaultTitle);
                 evOnDefaultContentNeeded.fire();

www/common/toolbar3.js

@@ -720,6 +720,7 @@ define([
     };
 
     var createUnpinnedWarning0 = function (toolbar, config) {
+        if (true) { return; } // stub this call since it won't make it into the next release
         if (Common.isLoggedIn()) { return; }
         var pd = config.metadataMgr.getPrivateData();
         var o = pd.origin;