Fix race condition #2

www/code/main.js

@@ -22,6 +22,7 @@ define([
         Cryptpad: Cryptpad,
     };
 
+    $(function () {
         Cryptpad.styleAlerts();
         Cryptpad.addLoadingScreen();
 
@@ -30,7 +31,6 @@ define([
             return JSONSortify(obj);
         };
 
-    $(function () {
         var toolbar;
 
         var secret = Cryptpad.getSecrets();

www/pad/main.js

@@ -21,6 +21,9 @@ define([
     Visible, Notify) {
     var $ = window.jQuery;
     var saveAs = window.saveAs;
+
+    $(function () {
+
     var ifrw = $('#pad-iframe')[0].contentWindow;
     var Ckeditor; // to be initialized later...
     var DiffDom = window.diffDOM;
@@ -814,4 +817,6 @@ define([
     };
 
     $(first);
+
+    });
 });

www/poll/main.js

@@ -15,6 +15,8 @@ define([
 ], function (Config, Messages, TextPatcher, Listmap, Crypto, Cryptpad, Hyperjson, Renderer, Toolbar, Visible, Notify) {
     var $ = window.jQuery;
 
+    $(function () {
+
     var unlockHTML = '<i class="fa fa-unlock" aria-hidden="true"></i>';
     var lockHTML = '<i class="fa fa-lock" aria-hidden="true"></i>';
     var HIDE_INTRODUCTION_TEXT = "hide_poll_text";
@@ -786,5 +788,7 @@ define([
             onConnectError();
         }
     });
+
+    });
 });
 

www/slide/main.js

@@ -28,9 +28,7 @@ define([
 
     var SLIDE_BACKCOLOR_ID = "cryptpad-backcolor";
     var SLIDE_COLOR_ID = "cryptpad-color";
-    Cryptpad.styleAlerts();
 
-    Cryptpad.addLoadingScreen();
 
     var stringify = function (obj) {
         return JSONSortify(obj);
@@ -45,6 +43,9 @@ define([
     };
 
     $(function () {
+        Cryptpad.styleAlerts();
+        Cryptpad.addLoadingScreen();
+
         var ifrw = module.ifrw = $('#pad-iframe')[0].contentWindow;
         var toolbar;