From f4b477ee37779cf2b7f9b73aa2ed457de7cf7b28 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 1 Feb 2023 18:02:03 +0100 Subject: [PATCH] Clean XXX --- customize.dist/pages/install.js | 5 ----- lib/decrees.js | 2 -- scripts/build.js | 2 +- scripts/install.js | 1 - www/calendar/inner.js | 2 +- www/common/inner/access.js | 2 +- www/common/onlyoffice/inner.js | 4 +--- www/common/outer/async-store.js | 2 +- www/common/outer/calendar.js | 3 +-- www/common/outer/roster.js | 1 - www/common/outer/userObject.js | 2 +- www/common/proxy-manager.js | 2 +- www/common/test.js | 1 - www/convert/inner.js | 2 +- www/form/inner.js | 2 +- www/form/main.js | 2 +- www/secureiframe/main.js | 2 +- 17 files changed, 12 insertions(+), 25 deletions(-) diff --git a/customize.dist/pages/install.js b/customize.dist/pages/install.js index 7bbf9e4cd..dbe68b308 100644 --- a/customize.dist/pages/install.js +++ b/customize.dist/pages/install.js @@ -14,11 +14,6 @@ define([ return; } -/* -Msg.install_header = "CryptPad Install"; // XXX -Msg.install_notes = ""; // XXX -*/ Msg.install_token = "Install token"; document.title = Msg.install_header; diff --git a/lib/decrees.js b/lib/decrees.js index 7afac7578..c7fd79f8a 100644 --- a/lib/decrees.js +++ b/lib/decrees.js @@ -329,8 +329,6 @@ commands.ADD_INSTALL_TOKEN = function (Env, args) { var token = args[0]; - // XXX check length, etc. ? - Env.installToken = token; return true; diff --git a/scripts/build.js b/scripts/build.js index 1f63f50aa..b0c0b5597 100644 --- a/scripts/build.js +++ b/scripts/build.js @@ -229,7 +229,7 @@ appIndexesToBuild.forEach(function (app) { write(built, `./www/${app}/index.html`); - // XXX preloading version for inner.html + // TODO preloading version for inner.html }); var instance; diff --git a/scripts/install.js b/scripts/install.js index 0587ce789..c0e57a5eb 100644 --- a/scripts/install.js +++ b/scripts/install.js @@ -22,7 +22,6 @@ nThen(function (w) { console.log('Existing token'); token = Env.installToken; } - // XXX IF ADMINS ABORT? })); }).nThen(function (w) { if (Env.installToken) { return; } diff --git a/www/calendar/inner.js b/www/calendar/inner.js index 14a6c2333..bee31eab9 100644 --- a/www/calendar/inner.js +++ b/www/calendar/inner.js @@ -1397,8 +1397,8 @@ ICS ==> create a new event with the same UID and a RECURRENCE-ID field (with a v if (updatedOn) { delete APP.recurrenceRule._next; } APP.wasRecurrent = Boolean(APP.recurrenceRule); -// XXX TEST /* +// Test data: APP.recurrenceRule = { freq: 'yearly', interval: 2, diff --git a/www/common/inner/access.js b/www/common/inner/access.js index 58d388271..823268ea0 100644 --- a/www/common/inner/access.js +++ b/www/common/inner/access.js @@ -867,7 +867,7 @@ define([ // In the properties, we should have the edit href if we know it. // We should know it because the pad is stored, but it's better to check... //if (!data.noEditPassword && !opts.noEditPassword && owned && data.href) { - if (!data.noEditPassword && !opts.noEditPassword && owned && data.href && parsed.type !== "form") { // XXX password change in forms block responses (validation & decryption) + if (!data.noEditPassword && !opts.noEditPassword && owned && data.href && parsed.type !== "form") { // TODO password change in forms block responses (validation & decryption) var isOO = parsed.type === 'sheet'; var isFile = parsed.hashData.type === 'file'; var isSharedFolder = parsed.type === 'drive'; diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 3e06c4818..8dca48b31 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -2134,9 +2134,7 @@ Uncaught TypeError: Cannot read property 'calculatedType' of null var exportXLSXFile = function() { var text = getContent(); var suggestion = Title.suggestTitle(Title.defaultTitle); - var ext = ['.xlsx', '.ods', '.bin', - //'.csv', // XXX 4.11.0 - '.pdf']; + var ext = ['.xlsx', '.ods', '.bin', '.pdf']; var type = common.getMetadataMgr().getPrivateData().ooType; var warning = ''; if (type==="presentation") { diff --git a/www/common/outer/async-store.js b/www/common/outer/async-store.js index 327309f20..658a6f531 100644 --- a/www/common/outer/async-store.js +++ b/www/common/outer/async-store.js @@ -1694,7 +1694,7 @@ define([ var ed = Util.find(store, ['proxy', 'teams', teamId, 'keys', 'drive', 'edPublic']); var edPrivate = Util.find(store, ['proxy', 'teams', teamId, 'keys', 'drive', 'edPrivate']); if (allowed.indexOf(ed) === -1) { return false; } - if (!edPrivate) { return false; } // XXX: Only editors can authenticate... + if (!edPrivate) { return false; } // FIXME: Only editors can authenticate... // This team is allowed: use its rpc var t = teamModule.getTeam(teamId); _store = t; diff --git a/www/common/outer/calendar.js b/www/common/outer/calendar.js index d59579814..486e10dd9 100644 --- a/www/common/outer/calendar.js +++ b/www/common/outer/calendar.js @@ -224,7 +224,7 @@ define([ }; var addReminders = function (ctx, id, ev) { var calendar = ctx.calendars[id]; - if (!ev) { return; } // XXX deleted event remote: delete reminders + if (!ev) { return; } if (!calendar || !calendar.reminders) { return; } if (calendar.stores.length === 1 && calendar.stores[0] === 0) { return; } @@ -1064,7 +1064,6 @@ define([ Calendar.init = function (cfg, waitFor, emit) { var calendar = {}; var store = cfg.store; - //if (!store.loggedIn || !store.proxy.edPublic) { return; } // XXX logged in only? we should al least allow read-only for URL calendars var ctx = { loggedIn: store.loggedIn && store.proxy.edPublic, store: store, diff --git a/www/common/outer/roster.js b/www/common/outer/roster.js index 93f0880f4..0b72dd6a4 100644 --- a/www/common/outer/roster.js +++ b/www/common/outer/roster.js @@ -470,7 +470,6 @@ var factory = function (Util, Hash, CPNetflux, Sortify, nThen, Crypto, Feedback) delete clone.previewChannel; members[curve] = clone; - // XXX var remaining = members[author].remaining || 1; if (remaining === -1) { return true; } // Infinite uses, keep the link if (remaining > 1) { // Remove 1 use diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js index 0a9a6c407..84d64401e 100644 --- a/www/common/outer/userObject.js +++ b/www/common/outer/userObject.js @@ -856,7 +856,7 @@ define([ } } if (!Hash.isValidChannel(el.channel)) { - // XXX delete channel? replace with parsed.channel? + // FIXME delete channel? replace with parsed.channel? console.error('Remove invalid channel', el.channel, el); // toClean.push(id); } diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js index b4c985dc9..60147c245 100644 --- a/www/common/proxy-manager.js +++ b/www/common/proxy-manager.js @@ -249,7 +249,7 @@ define([ var obj = Util.clone(proxy.metadata || {}); for (var k in Env.user.proxy[UserObject.SHARED_FOLDERS][id] || {}) { - if (typeof(Env.user.proxy[UserObject.SHARED_FOLDERS][id][k]) === "undefined") { // XXX "deleted folder" for restricted shared folders when viewer in a team + if (typeof(Env.user.proxy[UserObject.SHARED_FOLDERS][id][k]) === "undefined") { // TODO "deleted folder" for restricted shared folders when viewer in a team continue; } var data = Util.clone(Env.user.proxy[UserObject.SHARED_FOLDERS][id][k]); diff --git a/www/common/test.js b/www/common/test.js index 9600df0e1..eb83ff09c 100644 --- a/www/common/test.js +++ b/www/common/test.js @@ -1,7 +1,6 @@ define([], function () { if (window.__CRYPTPAD_TEST_OBJ_) { return window.__CRYPTPAD_TEST_OBJ_; } /* - // XXX localhost secureiframe fix var out = function () {}; out.options = {}; out.testing = false; diff --git a/www/convert/inner.js b/www/convert/inner.js index 4db50209c..e09b1f718 100644 --- a/www/convert/inner.js +++ b/www/convert/inner.js @@ -294,6 +294,7 @@ define([ Messages.convertPage = "Convert"; // XXX 4.11.0 Messages.convert_hint = "Pick the file you want to convert. The list of output format will be visible afterwards."; // XXX 4.11.0 + Messages.convert_unsupported = "UNSUPPORTED FILE TYPE :("; // XXX var createToolbar = function () { var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle', 'notifications']; @@ -328,7 +329,6 @@ define([ type: 'file' }); APP.$rightside.append([hint, picker]); - Messages.convert_unsupported = "UNSUPPORTED FILE TYPE :("; // XXX $(picker).on('change', function () { APP.$rightside.find('button, div.notice').remove(); diff --git a/www/form/inner.js b/www/form/inner.js index 11f29ba20..d99fb4fef 100644 --- a/www/form/inner.js +++ b/www/form/inner.js @@ -4005,7 +4005,7 @@ define([ $container.empty().append(_content); -// XXX Delete key form_updateMsg +// XXX Delete translation key form_updateMsg if (editable) { var responseMsg = h('div.cp-form-response-msg-container'); var $responseMsg = $(responseMsg).appendTo($container); diff --git a/www/form/main.js b/www/form/main.js index 4ef169869..ccb46bbaf 100644 --- a/www/form/main.js +++ b/www/form/main.js @@ -314,7 +314,7 @@ define([ if (obj && obj.error) { err = obj.error; return; } var messages = obj.messages; if (!messages.length) { - // XXX TODO delete from drive.forms + // TODO delete from drive.forms? return; } if (obj.lastKnownHash !== answer.hash) { return; } diff --git a/www/secureiframe/main.js b/www/secureiframe/main.js index 8c33a2ff1..5ba4b7657 100644 --- a/www/secureiframe/main.js +++ b/www/secureiframe/main.js @@ -28,7 +28,7 @@ define([ }; window.rc = requireConfig; window.apiconf = ApiConfig; - // XXX extra sandboxing features are temporarily disabled as I suspect this is the cause of a regression in Safari + // FIXME extra sandboxing features are temporarily disabled as I suspect this is the cause of a regression in Safari $('#sbox-secure-iframe')/*.attr('sandbox', 'allow-scripts allow-popups allow-modals')*/.attr('src', ApiConfig.httpSafeOrigin + '/secureiframe/inner.html?' + requireConfig.urlArgs + '#' + encodeURIComponent(JSON.stringify(req)));