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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
yflory
2017-06-19 15:58:26 +02:00
parent d3b9ac2511 499087fd52
commit 91d46cdee4
4 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
www/login/main.js
View File

@@ -64,7 +64,12 @@ define([
$('button.login').click();
});
var hashing = false;
$('button.login').click(function () {
if (hashing) { return void console.log("hashing is already in progress"); }
hashing = true;
// setTimeout 100ms to remove the keyboard on mobile devices before the loading screen pops up
window.setTimeout(function () {
Cryptpad.addLoadingScreen(Messages.login_hashing);
@@ -89,6 +94,7 @@ define([
Cryptpad.feedback('LOGIN', true);
Cryptpad.whenRealtimeSyncs(result.realtime, function() {
Cryptpad.login(result.userHash, result.userName, function () {
hashing = false;
if (sessionStorage.redirectTo) {
var h = sessionStorage.redirectTo;
var parser = document.createElement('a');
@@ -107,17 +113,23 @@ define([
switch (err) {
case 'NO_SUCH_USER':
Cryptpad.removeLoadingScreen(function () {
Cryptpad.alert(Messages.login_noSuchUser);
Cryptpad.alert(Messages.login_noSuchUser, function () {
hashing = false;
});
});
break;
case 'INVAL_USER':
Cryptpad.removeLoadingScreen(function () {
Cryptpad.alert(Messages.login_invalUser);
Cryptpad.alert(Messages.login_invalUser, function () {
hashing = false;
});
});
break;
case 'INVAL_PASS':
Cryptpad.removeLoadingScreen(function () {
Cryptpad.alert(Messages.login_invalPass);
Cryptpad.alert(Messages.login_invalPass, function () {
hashing = false;
});
});
break;
default: // UNHANDLED ERROR

4
www/poll/main.js
View File

@@ -491,7 +491,7 @@ var ready = function (info, userid, readOnly) {
APP.$createRow = $('#create-option').click(function () {
Render.createRow(proxy, function (empty, id) {
change(null, null, null, null, function() {
$('.edit[data-rt-id="' + id + '"]').click();
handleSpan($('.edit[data-rt-id="' + id + '"]')[0]);
});
});
});
@@ -499,7 +499,7 @@ var ready = function (info, userid, readOnly) {
APP.$createCol = $('#create-user').click(function () {
Render.createColumn(proxy, function (empty, id) {
change(null, null, null, null, function() {
$('.lock[data-rt-id="' + id + '"]').click();
handleSpan($('.lock[data-rt-id="' + id + '"]')[0]);
});
});
});

2
www/whiteboard/main.js
View File

@@ -338,12 +338,12 @@ window.canvas = canvas;
});
$rightside.append($forget);
makeColorButton($rightside);
var editHash;
if (!readOnly) {
editHash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
makeColorButton($rightside);
}
if (!readOnly) { Cryptpad.replaceHash(editHash); }
};