blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix INVALID_RESPONSE error in the file app

Browse source
This commit is contained in:
yflory 2018-02-16 12:02:20 +01:00
parent 54a91f1153
commit 037a6ccc35
4 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rpc.js
View file

@ -1181,7 +1181,7 @@ RPC.create = function (
});
case 'IS_NEW_CHANNEL':
return void isNewChannel(Env, msg[1], function (e, isNew) {
respond(null, [null, isNew, null]);
respond(e, [null, isNew, null]);
});
default:
console.error("unsupported!");

2
www/common/rpc.js
View file

@ -102,7 +102,7 @@ types of messages:
}
// HACK to hide messages from the anon rpc
if (parsed.length !== 4) {
if (parsed.length !== 4 && parsed[1] !== 'ERROR') {
console.log(parsed);
console.error("received message [%s] for txid[%s] with no callback", msg, txid);
}

10
www/common/sframe-common-outer.js
View file

@ -132,10 +132,12 @@ define([
// Check if the pad exists on server
if (!window.location.hash) { isNewFile = true; return; }
Cryptpad.isNewChannel(window.location.href, waitFor(function (e, isNew) {
if (e) { return console.error(e); }
isNewFile = Boolean(isNew);
}));
if (realtime) {
Cryptpad.isNewChannel(window.location.href, waitFor(function (e, isNew) {
if (e) { return console.error(e); }
isNewFile = Boolean(isNew);
}));
}
}).nThen(function () {
var readOnly = secret.keys && !secret.keys.editKeyStr;
var isNewHash = true;

7
www/todo/inner.js
View file

@ -51,7 +51,7 @@ define([
Sortable.create($list[0], {
store: {
get: function (sortable) {
get: function () {
return todo.getOrder();
},
set: function (sortable) {
@ -135,6 +135,8 @@ define([
$taskDiv.addClass('cp-app-todo-task-complete');
}
var $span = $('<span>', { 'class': 'cp-app-todo-task-text' });
var $input = $('<input>', {
type: 'text',
'class': 'cp-app-todo-task-input'
@ -147,8 +149,7 @@ define([
}
}).appendTo($taskDiv);
var $span = $('<span>', { 'class': 'cp-app-todo-task-text' })
.text(entry.task)
$span.text(entry.task)
.appendTo($taskDiv)
.click(function () {
$input.show();