web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix race conditon

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/drive/main.js
View File

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

2
www/register/main.js
View File

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