Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager

www/pad/main.js

@@ -77,6 +77,11 @@ define([
         return hj;
     };
 
+    var onConnectError = function (info) {
+        module.spinner.hide();
+        Cryptpad.alert(Messages.websocketError);
+    };
+
     var andThen = function (Ckeditor) {
         var secret = Cryptpad.getSecrets();
         var readOnly = secret.keys && !secret.keys.editKeyStr;
@@ -691,6 +696,8 @@ define([
                 }
             };
 
+            var onError = realtimeOptions.onError = onConnectError;
+
             var onLocal = realtimeOptions.onLocal = function () {
                 if (initializing) { return; }
                 if (readOnly) { return; }
@@ -736,6 +743,11 @@ define([
             // TODO handle error
             andThen(Ckeditor);
         });
+        Cryptpad.onError(function (info) {
+            if (info && info.type === "store") {
+                onConnectError();
+            }
+        });
     };
 
     var first = function () {