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

Fix polls table not updated with local events

Browse Source
This commit is contained in:
yflory 2017-01-23 10:51:44 +01:00
parent 99b8898e54
commit 5e36d9ea29
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
www/poll/main.js
View File

@ -26,6 +26,13 @@ define([
secret.keys = secret.key; secret.keys = secret.key;
} }
var DEBUG = false;
var debug = console.log;
if (!DEBUG) {
debug = function() {};
}
var error = console.error;
Cryptpad.addLoadingScreen(); Cryptpad.addLoadingScreen();
var onConnectError = function (info) { var onConnectError = function (info) {
Cryptpad.errorLoadingScreen(Messages.websocketError); Cryptpad.errorLoadingScreen(Messages.websocketError);
@ -187,11 +194,11 @@ define([
/* Any time the realtime object changes, call this function */ /* Any time the realtime object changes, call this function */
var change = function (o, n, path, throttle) { var change = function (o, n, path, throttle) {
if (!Cryptpad.isArray(path)) { if (path && !Cryptpad.isArray(path)) {
return; return;
} }
if (path && path.join) { if (path && path.join) {
console.log("Change from [%s] to [%s] at [%s]", debug("Change from [%s] to [%s] at [%s]",
o, n, path.join(', ')); o, n, path.join(', '));
} }
@ -242,7 +249,7 @@ define([
var type = input.type.toLowerCase(); var type = input.type.toLowerCase();
var id = getRealtimeId(input); var id = getRealtimeId(input);
console.log(input); debug(input);
var object = APP.proxy; var object = APP.proxy;
@ -253,22 +260,22 @@ define([
switch (type) { switch (type) {
case 'text': case 'text':
console.log("text[rt-id='%s'] [%s]", id, input.value); debug("text[rt-id='%s'] [%s]", id, input.value);
if (!input.value) { return void console.log("Hit enter?"); } if (!input.value) { return void debug("Hit enter?"); }
Render.setValue(object, id, input.value); Render.setValue(object, id, input.value);
change(null, null, null, 50); change(null, null, null, 50);
break; break;
case 'checkbox': case 'checkbox':
console.log("checkbox[tr-id='%s'] %s", id, input.checked); debug("checkbox[tr-id='%s'] %s", id, input.checked);
if (APP.editable.col.indexOf(x) >= 0 || x === APP.userid) { if (APP.editable.col.indexOf(x) >= 0 || x === APP.userid) {
Render.setValue(object, id, input.checked); Render.setValue(object, id, input.checked);
change(); change();
} else { } else {
console.log('checkbox locked'); debug('checkbox locked');
} }
break; break;
default: default:
console.log("Input[type='%s']", type); debug("Input[type='%s']", type);
break; break;
} }
}; };
@ -308,7 +315,7 @@ define([
} else if (type === 'cell') { } else if (type === 'cell') {
change(); change();
} else { } else {
console.log("UNHANDLED"); debug("UNHANDLED");
} }
}; };
@ -333,10 +340,10 @@ define([
var target = e && e.target; var target = e && e.target;
if (isKeyup) { if (isKeyup) {
console.log("Keyup!"); debug("Keyup!");
} }
if (!target) { return void console.log("NO TARGET"); } if (!target) { return void debug("NO TARGET"); }
var nodeName = target && target.nodeName; var nodeName = target && target.nodeName;
@ -356,7 +363,7 @@ define([
//console.error(new Error("C'est pas possible!")); //console.error(new Error("C'est pas possible!"));
break; break;
default: default:
console.log(target, nodeName); debug(target, nodeName);
break; break;
} }
}; };
@ -366,7 +373,7 @@ define([
*/ */
var prepareProxy = function (proxy, schema) { var prepareProxy = function (proxy, schema) {
if (proxy && proxy.version === 1) { return; } if (proxy && proxy.version === 1) { return; }
console.log("Configuring proxy schema..."); debug("Configuring proxy schema...");
proxy.info = proxy.info || schema.info; proxy.info = proxy.info || schema.info;
Object.keys(schema.info).forEach(function (k) { Object.keys(schema.info).forEach(function (k) {
@ -466,8 +473,8 @@ define([
document.title = newTitle; document.title = newTitle;
Cryptpad.renamePad(newTitle, function (err, data) { Cryptpad.renamePad(newTitle, function (err, data) {
if (err) { if (err) {
console.log("Couldn't set pad title"); debug("Couldn't set pad title");
console.error(err); error(err);
document.title = oldTitle; document.title = oldTitle;
return; return;
} }
@ -501,8 +508,8 @@ define([
var $description = $('#description').attr('placeholder', Messages.poll_descriptionHint || 'description'); var $description = $('#description').attr('placeholder', Messages.poll_descriptionHint || 'description');
var ready = function (info, userid, readOnly) { var ready = function (info, userid, readOnly) {
console.log("READY"); debug("READY");
console.log('userid: %s', userid); debug('userid: %s', userid);
var proxy = APP.proxy; var proxy = APP.proxy;
var uncommitted = APP.uncommitted = {}; var uncommitted = APP.uncommitted = {};
@ -613,7 +620,7 @@ define([
notify(); notify();
} }
console.log("change: (%s, %s, [%s])", o, n, p.join(', ')); debug("change: (%s, %s, [%s])", o, n, p.join(', '));
}) })
.on('change', ['table'], change) .on('change', ['table'], change)
.on('remove', [], change); .on('remove', [], change);
@ -727,8 +734,8 @@ define([
Cryptpad.getPadTitle(function (err, title) { Cryptpad.getPadTitle(function (err, title) {
if (err) { if (err) {
console.error(err); error(err);
console.log("Couldn't get pad title"); debug("Couldn't get pad title");
return; return;
} }
updateTitle(title || defaultName); updateTitle(title || defaultName);

1
www/poll/render.js
View File

@ -127,7 +127,6 @@ var Renderer = function (Cryptpad) {
}; };
var createRow = Render.createRow = function (obj, cb, id, value) { var createRow = Render.createRow = function (obj, cb, id, value) {
console.error('new row!');
var order = Cryptpad.find(obj, ['table', 'rowsOrder']); var order = Cryptpad.find(obj, ['table', 'rowsOrder']);
if (!order) { throw new Error("Uninitialized realtime object!"); } if (!order) { throw new Error("Uninitialized realtime object!"); }
id = id || rowuid(); id = id || rowuid();