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

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': case 'IS_NEW_CHANNEL':
return void isNewChannel(Env, msg[1], function (e, isNew) { return void isNewChannel(Env, msg[1], function (e, isNew) {
respond(null, [null, isNew, null]); respond(e, [null, isNew, null]);
}); });
default: default:
console.error("unsupported!"); 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 // HACK to hide messages from the anon rpc
if (parsed.length !== 4) { if (parsed.length !== 4 && parsed[1] !== 'ERROR') {
console.log(parsed); console.log(parsed);
console.error("received message [%s] for txid[%s] with no callback", msg, txid); 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 // Check if the pad exists on server
if (!window.location.hash) { isNewFile = true; return; } if (!window.location.hash) { isNewFile = true; return; }
Cryptpad.isNewChannel(window.location.href, waitFor(function (e, isNew) { if (realtime) {
if (e) { return console.error(e); } Cryptpad.isNewChannel(window.location.href, waitFor(function (e, isNew) {
isNewFile = Boolean(isNew); if (e) { return console.error(e); }
})); isNewFile = Boolean(isNew);
}));
}
}).nThen(function () { }).nThen(function () {
var readOnly = secret.keys && !secret.keys.editKeyStr; var readOnly = secret.keys && !secret.keys.editKeyStr;
var isNewHash = true; var isNewHash = true;

7
www/todo/inner.js
View File

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