Fix race conditon

This commit is contained in:
yflory 2017-02-17 15:16:03 +01:00
parent 94417d9a8b
commit dd014f6ef2
2 changed files with 88 additions and 87 deletions

View File

@ -16,12 +16,13 @@ define([
var $ = window.jQuery;
var saveAs = window.saveAs;
// Use `$(function () {});` to make sure the html is loaded before doing anything else
$(function () {
var $iframe = $('#pad-iframe').contents();
var ifrw = $('#pad-iframe')[0].contentWindow;
Cryptpad.addLoadingScreen();
var onConnectError = function (info) {
Cryptpad.errorLoadingScreen(Messages.websocketError);
@ -2032,5 +2033,5 @@ define([
}
});
});
});

View File

@ -39,7 +39,6 @@ define([
} else {
$main.find('#userForm').removeClass('hidden');
}
});
// text and password input fields
var $uname = $('#username');
@ -139,3 +138,4 @@ define([
});
});
});
});