Fix race condition #2

2017-02-17 15:39:34 +01:00
parent 1540ae3f6f
commit c17f28e5fe
4 changed files with 20 additions and 10 deletions
--- a/www/slide/main.js
+++ b/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;