infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

lint compliance

Browse Source
pull/1/head
yflory 4 years ago
parent a948237043
commit 6694d9df03
4 changed files with 36 additions and 47 deletions
Show Stats Download Patch File Download Diff File

9
www/common/common-interface.js
Unescape Escape View File

@ -1223,6 +1223,7 @@ define([
$.extend(markOpts, opts.mark || {}); $.extend(markOpts, opts.mark || {});
var input = h('input', inputOpts); var input = h('input', inputOpts);
var $input = $(input);
var mark = h('span.cp-radio-mark', markOpts); var mark = h('span.cp-radio-mark', markOpts);
var label = h('span.cp-checkmark-label', labelTxt); var label = h('span.cp-checkmark-label', labelTxt);
@ -1231,13 +1232,13 @@ define([
if (e.which === 32) { if (e.which === 32) {
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
if ($(input).is(':checked')) { return; } if ($input.is(':checked')) { return; }
$(input).prop('checked', !$(input).is(':checked')); $input.prop('checked', !$input.is(':checked'));
$(input).change(); $input.change();
} }
}); });
$(input).change(function () { $(mark).focus(); }); $input.change(function () { $(mark).focus(); });
var radio = h('label', labelOpts, [ var radio = h('label', labelOpts, [
input, input,

2
www/common/cryptpad-common.js
Unescape Escape View File

@ -69,7 +69,7 @@ define([
}, cb); }, cb);
}; };
common.getAccessKeys = function (cb, opts) { common.getAccessKeys = function (cb) {
var keys = []; var keys = [];
Nthen(function (waitFor) { Nthen(function (waitFor) {
// Push account keys // Push account keys

50
www/form/inner.js
Unescape Escape View File

@ -23,7 +23,6 @@ define([
'/lib/datepicker/flatpickr.js', '/lib/datepicker/flatpickr.js',
'/bower_components/sortablejs/Sortable.min.js', '/bower_components/sortablejs/Sortable.min.js',
'/bower_components/file-saver/FileSaver.min.js',
'css!/lib/datepicker/flatpickr.min.css', 'css!/lib/datepicker/flatpickr.min.css',
'css!/bower_components/components-font-awesome/css/font-awesome.min.css', 'css!/bower_components/components-font-awesome/css/font-awesome.min.css',
'less!/form/app-form.less', 'less!/form/app-form.less',
@ -49,12 +48,10 @@ define([
Sortable Sortable
) )
{ {
var SaveAs = window.saveAs;
var APP = window.APP = { var APP = window.APP = {
}; };
var is24h = false; var is24h = false;
var dayFormat = "Y-m-d";
var dateFormat = "Y-m-d H:i"; var dateFormat = "Y-m-d H:i";
try { try {
is24h = !new Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(0).match(/AM/); is24h = !new Intl.DateTimeFormat(navigator.language, { hour: 'numeric' }).format(0).match(/AM/);
@ -142,7 +139,7 @@ define([
value: v.max, value: v.max,
min: 1, min: 1,
max: v.values.length max: v.values.length
}) });
maxOptions = h('div.cp-form-edit-max-options', [ maxOptions = h('div.cp-form-edit-max-options', [
h('span', Messages.form_editMax), h('span', Messages.form_editMax),
maxInput maxInput
@ -181,7 +178,7 @@ define([
} }
// Show existing options // Show existing options
var $add; var $add, $addItem;
var getOption = function (val, isItem, uid) { var getOption = function (val, isItem, uid) {
var input = h('input', {value:val}); var input = h('input', {value:val});
if (uid) { $(input).data('uid', uid); } if (uid) { $(input).data('uid', uid); }
@ -393,7 +390,7 @@ define([
var makePollTable = function (answers, opts) { var makePollTable = function (answers, opts) {
// Create first line with options // Create first line with options
var els = opts.values.map(function (data, i) { var els = opts.values.map(function (data) {
if (opts.type === "day") { if (opts.type === "day") {
var _date = new Date(data); var _date = new Date(data);
data = _date.toLocaleDateString(); data = _date.toLocaleDateString();
@ -451,6 +448,15 @@ define([
return res; return res;
}; };
var getBlockAnswers = function (answers, uid, filterCurve) {
return Object.keys(answers || {}).map(function (user) {
if (filterCurve && user === filterCurve) { return; }
try {
return answers[user].msg[uid];
} catch (e) { console.error(e); }
}).filter(Boolean);
};
var TYPES = { var TYPES = {
input: { input: {
get: function () { get: function () {
@ -501,7 +507,7 @@ define([
tag: tag, tag: tag,
getValue: function () { getValue: function () {
var res; var res;
els.some(function (el, i) { els.some(function (el) {
var $i = $(el).find('input'); var $i = $(el).find('input');
if (Util.isChecked($i)) { if (Util.isChecked($i)) {
res = $i.data('val'); res = $i.data('val');
@ -592,10 +598,10 @@ define([
getValue: function () { getValue: function () {
var res = {}; var res = {};
var l = lines.slice(1); var l = lines.slice(1);
l.forEach(function (el, i) { l.forEach(function (el) {
var $el = $(el); var $el = $(el);
var uid = $el.attr('data-uid'); var uid = $el.attr('data-uid');
var $l = $el.find('input').each(function (i, input) { $el.find('input').each(function (i, input) {
var $i = $(input); var $i = $(input);
if (res[uid]) { return; } if (res[uid]) { return; }
if (Util.isChecked($i)) { res[uid] = $i.data('val'); } if (Util.isChecked($i)) { res[uid] = $i.data('val'); }
@ -696,7 +702,7 @@ define([
tag: tag, tag: tag,
getValue: function () { getValue: function () {
var res = []; var res = [];
els.forEach(function (el, i) { els.forEach(function (el) {
var $i = $(el).find('input'); var $i = $(el).find('input');
if (Util.isChecked($i)) { if (Util.isChecked($i)) {
res.push($i.data('val')); res.push($i.data('val'));
@ -801,11 +807,11 @@ define([
getValue: function () { getValue: function () {
var res = {}; var res = {};
var l = lines.slice(1); var l = lines.slice(1);
l.forEach(function (el, i) { l.forEach(function (el) {
var $el = $(el); var $el = $(el);
var uid = $el.attr('data-uid'); var uid = $el.attr('data-uid');
res[uid] = []; res[uid] = [];
var $l = $el.find('input').each(function (i, input) { $el.find('input').each(function (i, input) {
var $i = $(input); var $i = $(input);
if (Util.isChecked($i)) { res[uid].push($i.data('val')); } if (Util.isChecked($i)) { res[uid].push($i.data('val')); }
}); });
@ -881,13 +887,12 @@ define([
get: function (opts, answers, username) { get: function (opts, answers, username) {
if (!opts) { opts = TYPES.poll.defaultOpts; } if (!opts) { opts = TYPES.poll.defaultOpts; }
if (!Array.isArray(opts.values)) { return; } if (!Array.isArray(opts.values)) { return; }
var name = Util.uid();
var lines = makePollTable(answers, opts); var lines = makePollTable(answers, opts);
// Add form // Add form
// XXX only if not already answered! // XXX only if not already answered!
var addLine = opts.values.map(function (data, i) { var addLine = opts.values.map(function (data) {
var cell = h('div.cp-poll-cell.cp-form-poll-choice', [ var cell = h('div.cp-poll-cell.cp-form-poll-choice', [
h('i.fa.fa-times.cp-no'), h('i.fa.fa-times.cp-no'),
h('i.fa.fa-check.cp-yes'), h('i.fa.fa-check.cp-yes'),
@ -989,14 +994,6 @@ define([
$container.append(elements); $container.append(elements);
}; };
var getBlockAnswers = function (answers, uid, filterCurve) {
return Object.keys(answers || {}).map(function (user) {
if (filterCurve && user === filterCurve) { return; }
try {
return answers[user].msg[uid];
} catch (e) { console.error(e); }
}).filter(Boolean);
};
var getFormResults = function () { var getFormResults = function () {
if (!Array.isArray(APP.formBlocks)) { return; } if (!Array.isArray(APP.formBlocks)) { return; }
var results = {}; var results = {};
@ -1034,8 +1031,9 @@ define([
}); });
}); });
var viewResults;
if (content.answers.privateKey) { if (content.answers.privateKey) {
var viewResults = h('button.btn.btn-primary', [ viewResults = h('button.btn.btn-primary', [
h('span.cp-app-form-button-results', Messages.form_viewResults), h('span.cp-app-form-button-results', Messages.form_viewResults),
]); ]);
var sframeChan = framework._.sfCommon.getSframeChannel(); var sframeChan = framework._.sfCommon.getSframeChannel();
@ -1181,7 +1179,7 @@ define([
$(editButtons).show(); $(editButtons).show();
UI.log(Messages.saved); UI.log(Messages.saved);
var _answers = getBlockAnswers(APP.answers, uid); var _answers = getBlockAnswers(APP.answers, uid);
data = model.get(newOpts, answers); data = model.get(newOpts, _answers);
if (!data) { data = {}; } if (!data) { data = {}; }
$oldTag.before(data.tag).remove(); $oldTag.before(data.tag).remove();
}); });
@ -1306,8 +1304,6 @@ define([
if (endDate <= now) { if (endDate <= now) {
text = Messages._getKey('form_isClosed', [date]); text = Messages._getKey('form_isClosed', [date]);
buttonTxt = Messages.form_open; buttonTxt = Messages.form_open;
action = function () {
};
} else if (endDate > now) { } else if (endDate > now) {
text = Messages._getKey('form_willClose', [date]); text = Messages._getKey('form_willClose', [date]);
buttonTxt = Messages.form_removeEnd; buttonTxt = Messages.form_removeEnd;
@ -1481,7 +1477,7 @@ define([
} }
}; };
framework.onReady(function (isNew) { framework.onReady(function () {
var priv = metadataMgr.getPrivateData(); var priv = metadataMgr.getPrivateData();
if (APP.isEditor) { if (APP.isEditor) {

22
www/form/main.js
Unescape Escape View File

@ -8,6 +8,7 @@ define([
], function (nThen, ApiConfig, DomReady, SFCommonO) { ], function (nThen, ApiConfig, DomReady, SFCommonO) {
var Nacl = window.nacl; var Nacl = window.nacl;
var href, hash;
// Loaded in load #2 // Loaded in load #2
nThen(function (waitFor) { nThen(function (waitFor) {
DomReady.onReady(waitFor()); DomReady.onReady(waitFor());
@ -44,8 +45,8 @@ define([
channel: Utils.secret.channel, channel: Utils.secret.channel,
keys: { viewKeyStr: Nacl.util.encodeBase64(keys.cryptKey) } keys: { viewKeyStr: Nacl.util.encodeBase64(keys.cryptKey) }
}); });
var parsed = Utils.Hash.parseTypeHash('pad', auditorHash); var _parsed = Utils.Hash.parseTypeHash('pad', auditorHash);
meta.form_auditorHash = parsed.getHash({auditorKey: privateKey}); meta.form_auditorHash = _parsed.getHash({auditorKey: privateKey});
}; };
var addRpc = function (sframeChan, Cryptpad, Utils) { var addRpc = function (sframeChan, Cryptpad, Utils) {
@ -67,7 +68,7 @@ define([
nThen(function (w) { nThen(function (w) {
require([ require([
'/bower_components/chainpad-netflux/chainpad-netflux.js', '/bower_components/chainpad-netflux/chainpad-netflux.js',
], w(function (_CPNetflux, _Crypto) { ], w(function (_CPNetflux) {
CPNetflux = _CPNetflux; CPNetflux = _CPNetflux;
})); }));
Cryptpad.getAccessKeys(w(function (_keys) { Cryptpad.getAccessKeys(w(function (_keys) {
@ -83,7 +84,7 @@ define([
Cryptpad.makeNetwork(w(function (err, nw) { Cryptpad.makeNetwork(w(function (err, nw) {
network = nw; network = nw;
})); }));
}).nThen(function (w) { }).nThen(function () {
if (!network) { return void cb({error: "E_CONNECT"}); } if (!network) { return void cb({error: "E_CONNECT"}); }
var keys = Utils.secret && Utils.secret.keys; var keys = Utils.secret && Utils.secret.keys;
@ -120,9 +121,6 @@ define([
}); });
}); });
sframeChan.on("Q_FETCH_MY_ANSWERS", function (data, cb) { sframeChan.on("Q_FETCH_MY_ANSWERS", function (data, cb) {
var keys;
var CPNetflux;
var network;
var answer; var answer;
var myKeys; var myKeys;
nThen(function (w) { nThen(function (w) {
@ -136,7 +134,7 @@ define([
} }
answer = obj; answer = obj;
})); }));
}).nThen(function (w) { }).nThen(function () {
Cryptpad.getHistoryRange({ Cryptpad.getHistoryRange({
channel: data.channel, channel: data.channel,
lastKnownHash: answer.hash, lastKnownHash: answer.hash,
@ -144,7 +142,6 @@ define([
}, function (obj) { }, function (obj) {
if (obj && obj.error) { return void cb(obj); } if (obj && obj.error) { return void cb(obj); }
var messages = obj.messages; var messages = obj.messages;
var ephemeral_priv = answer.curvePrivate;
var res = Utils.Crypto.Mailbox.openOwnSecretLetter(messages[0].msg, { var res = Utils.Crypto.Mailbox.openOwnSecretLetter(messages[0].msg, {
validateKey: data.validateKey, validateKey: data.validateKey,
ephemeral_private: Nacl.util.decodeBase64(answer.curvePrivate), ephemeral_private: Nacl.util.decodeBase64(answer.curvePrivate),
@ -164,7 +161,7 @@ define([
Cryptpad.getFormKeys(w(function (keys) { Cryptpad.getFormKeys(w(function (keys) {
myKeys = keys; myKeys = keys;
})); }));
}).nThen(function (w) { }).nThen(function () {
var keys = Utils.secret && Utils.secret.keys; var keys = Utils.secret && Utils.secret.keys;
myKeys.signingKey = keys.secondarySignKey; myKeys.signingKey = keys.secondarySignKey;
@ -191,11 +188,6 @@ define([
}); });
}); });
}); });
sframeChan.on('EV_FORM_MAILBOX', function (data) {
var curvePair = Nacl.box.keyPair();
publicKey = Nacl.util.encodeBase64(curvePair.publicKey);
privateKey = Nacl.util.encodeBase64(curvePair.secretKey);
});
}; };
SFCommonO.start({ SFCommonO.start({
addData: addData, addData: addData,

Write Preview
Loading…
Cancel
Save