Merge branch 'infiniteSpinner' into fileManagerMerge

www/code/main.js

@@ -687,6 +687,11 @@ define([
                 }
             };
 
+            var onError = config.onError = function (info) {
+                module.spinner.hide();
+                Cryptpad.alert(Messages.websocketError);
+            };
+
             var realtime = module.realtime = Realtime.start(config);
 
             editor.on('change', onLocal);

www/common/cryptpad-common.js

@@ -589,6 +589,7 @@ define([
             $(function() {
                 // 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"
+
                 Alertify.reset();
                 if($('#pad-iframe').length) {
                     var $iframe = $('#pad-iframe');
@@ -875,6 +876,7 @@ define([
     var styleAlerts = common.styleAlerts = function (href) {
         var $link = $('link[href="/customize/alertify.css"]');
         if ($link.length) {
+            return;
             $link.attr('href', '');
             $link.attr('href', '/customize/alertify.css');
             return;

www/common/toolbar.js

@@ -313,12 +313,11 @@ define([
             }
         }
         else if (!firstConnection) {
-            lagErrors++;
             // Display the red light at the 2nd failed attemp to get the lag
-            if (lagErrors > 1) {
+            //if (lagErrors > 1) {
                 lagLight.addClass('lag-red');
                 title = Messages.redLight;
-            }
+            //}
         }
         if (title) {
             lagLight.attr('title', title);

www/pad/main.js

@@ -691,6 +691,11 @@ define([
                 }
             };
 
+            var onError = realtimeOptions.onError = function (info) {
+                module.spinner.hide();
+                Cryptpad.alert(Messages.websocketError);
+            };
+
             var onLocal = realtimeOptions.onLocal = function () {
                 if (initializing) { return; }
                 if (readOnly) { return; }

www/slide/main.js

@@ -786,6 +786,11 @@ define([
                 }
             };
 
+            var onError = config.onError = function (info) {
+                module.spinner.hide();
+                Cryptpad.alert(Messages.websocketError);
+            };
+
             var realtime = module.realtime = Realtime.start(config);
 
             editor.on('change', onLocal);