From 8b3cea9ad92cf0dfa5017961fbfdaab900d4d0a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 25 Nov 2019 15:11:49 +0000 Subject: [PATCH 01/10] remove // XXX --- www/common/common-ui-elements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 63921a8a6..ef3b962c8 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1095,7 +1095,7 @@ define([ var linkButtons = [ makeCancelButton(), !config.sharedFolder && { - className: 'secondary', // XXX style this diferently than cancel + className: 'secondary', name: Messages.share_linkOpen, onClick: function () { saveValue(); From a1f25d937cc7ba4f3c143aabd90ea2051b215462 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 25 Nov 2019 10:51:46 -0500 Subject: [PATCH 02/10] bump version to 3.6.0 (GoldenFrog) --- customize.dist/pages.js | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 23d6b43a6..b4cc4a0a4 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -103,7 +103,7 @@ define([ ])*/ ]) ]), - h('div.cp-version-footer', "CryptPad v3.5.0 (Falkland-wolf)") + h('div.cp-version-footer', "CryptPad v3.6.0 (GoldenFrog)") ]); }; diff --git a/package-lock.json b/package-lock.json index 066b26abc..ac23d00fa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cryptpad", - "version": "3.5.0", + "version": "3.6.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 41c6f1ec8..4b62e5a37 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "3.5.0", + "version": "3.6.0", "license": "AGPL-3.0+", "repository": { "type": "git", From d8df3fd034ea9748996a4e510c94224c982247ed Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 25 Nov 2019 16:53:47 +0100 Subject: [PATCH 03/10] Remove XXX --- www/common/outer/userObject.js | 1 - 1 file changed, 1 deletion(-) diff --git a/www/common/outer/userObject.js b/www/common/outer/userObject.js index 7182d6ab2..384ab99c2 100644 --- a/www/common/outer/userObject.js +++ b/www/common/outer/userObject.js @@ -167,7 +167,6 @@ define([ if (fd.rtChannel) { removeOwnedChannel(fd.rtChannel, function () {}); } - // XXX fd.lastVersion to delete the encrypted cp? } if (fd.lastVersion) { toClean.push(Hash.hrefToHexChannelId(fd.lastVersion)); } if (fd.rtChannel) { toClean.push(fd.rtChannel); } From 5be70f7673ac954edb07d37688124b464e452c0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 25 Nov 2019 15:56:39 +0000 Subject: [PATCH 04/10] remove // XXX --- www/common/common-ui-elements.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 64c9c2101..2211fc1b9 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -683,8 +683,6 @@ define([ })); } - // XXX problem with the hardcoded ": " here - // possibly duplicate translation keys if (data.tags && Array.isArray(data.tags)) { $d.append(h('div.cp-app-prop', [Messages.fm_prop_tagsList, h('br'), h('span.cp-app-prop-content', data.tags.join(', '))])); } From 27793c6755a178d5128b05596b91763aaaa80bc5 Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 25 Nov 2019 11:09:54 -0500 Subject: [PATCH 05/10] remove XXX --- www/common/common-ui-elements.js | 1 - 1 file changed, 1 deletion(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index a4d1345f6..4fec900f8 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1207,7 +1207,6 @@ define([ var modal = UI.dialog.tabs(tabs); $(modal).find('.alertify-tabs-titles').after(rights); - // XXX // disable edit share options if you don't have edit rights if (!hashes.editHash) { $rights.find('#cp-share-editable-false').attr('checked', true); From 89cff3c541882bcb3a95e39278d11af1b5608e48 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 25 Nov 2019 17:33:56 +0100 Subject: [PATCH 06/10] Remove invisible title in usergrid --- www/common/common-ui-elements.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index a4d1345f6..db1083acf 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -789,7 +789,7 @@ define([ }); var div = h('div.cp-usergrid-container' + noOthers, [ - h('label', label), + label ? h('label', label) : undefined, h('div.cp-usergrid-filter', (config.noFilter || config.noSelect) ? undefined : [ inputFilter, buttonSelect, From bf6681c5e6e3452ba92538c2cff49e9b3c82f1a9 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 25 Nov 2019 17:43:55 +0100 Subject: [PATCH 07/10] Better spacing between items in usergrid --- customize.dist/src/less2/include/usergrid.less | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less index 38202de86..19c3d1d3a 100644 --- a/customize.dist/src/less2/include/usergrid.less +++ b/customize.dist/src/less2/include/usergrid.less @@ -10,6 +10,7 @@ .cp-usergrid-grid { display: flex; flex-wrap: wrap; + margin: -3px; margin-bottom: 6px; } &.cp-usergrid-empty { @@ -42,17 +43,12 @@ justify-content: center; align-items: center; padding: 5px; - margin-bottom: 6px; - margin-right: 6px; + margin: 3px; cursor: default; transition: order 0.5s, background-color 0.5s; margin-top: 1px; .tools_unselectable(); - &:nth-child(6n) { - margin-right: 0; - } - &.cp-selected { background-color: @colortheme_alertify-primary; color: @colortheme_alertify-primary-text; From 09fdfa2ad2be1d42bb4984eb8e82029c1b496081 Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 25 Nov 2019 17:54:22 +0100 Subject: [PATCH 08/10] Fix usergrid UI issues --- customize.dist/src/less2/include/modals-ui-elements.less | 1 + customize.dist/src/less2/include/usergrid.less | 7 ++++++- www/common/common-ui-elements.js | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less index 57c9b0a53..6e3921781 100644 --- a/customize.dist/src/less2/include/modals-ui-elements.less +++ b/customize.dist/src/less2/include/modals-ui-elements.less @@ -6,6 +6,7 @@ & { // Share modal .msg.cp-inline-radio-group { + overflow: unset !important; .radio-group { display: flex; flex-direction: row; diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less index 19c3d1d3a..b12ebccaa 100644 --- a/customize.dist/src/less2/include/usergrid.less +++ b/customize.dist/src/less2/include/usergrid.less @@ -10,9 +10,13 @@ .cp-usergrid-grid { display: flex; flex-wrap: wrap; - margin: -3px; margin-bottom: 6px; } + &:not(.large) { + .cp-usergrid-grid { + margin: -3px; + } + } &.cp-usergrid-empty { .cp-usergrid-grid, .cp-usergrid-filter { display: none; @@ -75,6 +79,7 @@ width: 140px; height: 35px; flex-flow: row; + margin: 0; margin-right: 15px; margin-bottom: 1px; &:nth-child(3n) { diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 0ef92c048..280849e7f 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -788,7 +788,7 @@ define([ placeholder: Messages.share_filterFriend }); - var div = h('div.cp-usergrid-container' + noOthers, [ + var div = h('div.cp-usergrid-container' + noOthers + (config.large?'.large':''), [ label ? h('label', label) : undefined, h('div.cp-usergrid-filter', (config.noFilter || config.noSelect) ? undefined : [ inputFilter, From 77ee1b02dc05f3cafebe6938399bf17ef7f4c49d Mon Sep 17 00:00:00 2001 From: yflory Date: Mon, 25 Nov 2019 17:58:33 +0100 Subject: [PATCH 09/10] Add missing margin in usergrid --- customize.dist/src/less2/include/usergrid.less | 1 + 1 file changed, 1 insertion(+) diff --git a/customize.dist/src/less2/include/usergrid.less b/customize.dist/src/less2/include/usergrid.less index b12ebccaa..4ff807638 100644 --- a/customize.dist/src/less2/include/usergrid.less +++ b/customize.dist/src/less2/include/usergrid.less @@ -15,6 +15,7 @@ &:not(.large) { .cp-usergrid-grid { margin: -3px; + margin-bottom: 6px; } } &.cp-usergrid-empty { From b5a05c1de3e02126bf4b52a9c559d3cade64c15d Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 25 Nov 2019 20:37:04 -0500 Subject: [PATCH 10/10] clean up some dead code and do a quick optimizing pass --- www/common/common-interface.js | 84 +++++++++++++------------------- www/common/common-ui-elements.js | 31 ++++++------ 2 files changed, 49 insertions(+), 66 deletions(-) diff --git a/www/common/common-interface.js b/www/common/common-interface.js index 04acc26d8..72438fec2 100644 --- a/www/common/common-interface.js +++ b/www/common/common-interface.js @@ -595,54 +595,38 @@ define([ }, opts); var input = h('input.cp-password-input', attributes); - //var reveal = UI.createCheckbox('cp-password-reveal', Messages.password_show); var eye = h('span.fa.fa-eye.cp-password-reveal'); - /* - $(reveal).find('input').on('change', function () { - if($(this).is(':checked')) { - $(input).prop('type', 'text'); - $(input).focus(); - return; - } - $(input).prop('type', 'password'); - $(input).focus(); - }); - */ + var $eye = $(eye); + var $input = $(input); if (displayEye) { - $(eye).mousedown(function () { - $(input).prop('type', 'text'); - $(input).focus(); + $eye.mousedown(function () { + $input.prop('type', 'text'); + $input.focus(); }).mouseup(function(){ - $(input).prop('type', 'password'); - $(input).focus(); + $input.prop('type', 'password'); + $input.focus(); }).mouseout(function(){ - $(input).prop('type', 'password'); - $(input).focus(); + $input.prop('type', 'password'); + $input.focus(); }); } else { - $(eye).click(function () { - if ($(this).hasClass('fa-eye')) { - $(input).prop('type', 'text'); - $(input).focus(); - $(this).removeClass('fa-eye').addClass('fa-eye-slash'); + $eye.click(function () { + if ($eye.hasClass('fa-eye')) { + $input.prop('type', 'text'); + $input.focus(); + $eye.removeClass('fa-eye').addClass('fa-eye-slash'); return; } - $(input).prop('type', 'password'); - $(input).focus(); - $(this).removeClass('fa-eye-slash').addClass('fa-eye'); + $input.prop('type', 'password'); + $input.focus(); + $eye.removeClass('fa-eye-slash').addClass('fa-eye'); }); } - /*if (displayEye) { - $(reveal).hide(); - } else { - $(eye).hide(); - }*/ return h('span.cp-password-container', [ input, - //reveal, eye ]); }; @@ -685,12 +669,6 @@ define([ var LOADING = 'cp-loading'; - /*var getRandomTip = function () { - if (!Messages.tips || !Object.keys(Messages.tips).length) { return ''; } - var keys = Object.keys(Messages.tips); - var rdm = Math.floor(Math.random() * keys.length); - return Messages.tips[keys[rdm]]; - };*/ var loading = { error: false, driveState: 0, @@ -700,7 +678,7 @@ define([ config = config || {}; var loadingText = config.loadingText; var todo = function () { - var $loading = $('#' + LOADING); //.show(); + var $loading = $('#' + LOADING); $loading.css('display', ''); $loading.removeClass('cp-loading-hidden'); $('.cp-loading-spinner-container').show(); @@ -963,19 +941,21 @@ define([ $.extend(markOpts, opts.mark || {}); var input = h('input', inputOpts); + var $input = $(input); var mark = h('span.cp-checkmark-mark', markOpts); + var $mark = $(mark); var label = h('span.cp-checkmark-label', labelTxt); - $(mark).keydown(function (e) { + $mark.keydown(function (e) { if (e.which === 32) { e.stopPropagation(); e.preventDefault(); - $(input).prop('checked', !$(input).is(':checked')); - $(input).change(); + $input.prop('checked', !$input.is(':checked')); + $input.change(); } }); - $(input).change(function () { $(mark).focus(); }); + $input.change(function () { $mark.focus(); }); return h('label.cp-checkmark', labelOpts, [ input, @@ -1049,28 +1029,30 @@ define([ setHTML(h('div.cp-corner-footer'), footer) ]); + var $popup = $(popup); + $(minimize).click(function () { - $(popup).addClass('cp-minimized'); + $popup.addClass('cp-minimized'); }); $(maximize).click(function () { - $(popup).removeClass('cp-minimized'); + $popup.removeClass('cp-minimized'); }); if (opts.hidden) { - $(popup).addClass('cp-minimized'); + $popup.addClass('cp-minimized'); } if (opts.big) { - $(popup).addClass('cp-corner-big'); + $popup.addClass('cp-corner-big'); } var hide = function () { - $(popup).hide(); + $popup.hide(); }; var show = function () { - $(popup).show(); + $popup.show(); }; var deletePopup = function () { - $(popup).remove(); + $popup.remove(); }; $('body').append(popup); diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 4fec900f8..e8a30c63d 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -694,7 +694,7 @@ define([ if (data.atime) { $d.append(h('div.cp-app-prop', [Messages.fm_lastAccess, h('br'), h('span.cp-app-prop-content', new Date(data.atime).toLocaleString())])); } - + if (common.isLoggedIn()) { // check the size of this file... var bytes = 0; @@ -1039,7 +1039,7 @@ define([ present: present }); }; - + var getLinkValue = function (initValue) { var val = initValue || {}; var edit = val.edit !== undefined ? val.edit : Util.isChecked($rights.find('#cp-share-editable-true')); @@ -1121,7 +1121,7 @@ define([ onClose: config.onClose, }); - // Share with contacts tab + // Share with contacts tab var hasFriends = Object.keys(config.friends || {}).length !== 0; var onFriendShare = Util.mkEvent(); @@ -1133,7 +1133,7 @@ define([ onFriendShare.reg(saveValue); - // XXX Don't display access rights if no contacts + // XXX Don't display access rights if no contacts var contactsContent = h('div.cp-share-modal'); $(contactsContent).append(friendsList); @@ -1170,11 +1170,12 @@ define([ }]; var embed = h('div.cp-share-modal', embedContent); + var $embed = $(embed); // update values for link preview when radio btns change - $(embed).find('#cp-embed-link-preview').val(getEmbedValue()); + $embed.find('#cp-embed-link-preview').val(getEmbedValue()); $rights.find('input[type="radio"]').on('change', function () { - $(embed).find('#cp-embed-link-preview').val(getEmbedValue()); + $embed.find('#cp-embed-link-preview').val(getEmbedValue()); }); var frameEmbed = UI.dialog.customModal(embed, { @@ -1207,7 +1208,7 @@ define([ var modal = UI.dialog.tabs(tabs); $(modal).find('.alertify-tabs-titles').after(rights); - // disable edit share options if you don't have edit rights + // disable edit share options if you don't have edit rights if (!hashes.editHash) { $rights.find('#cp-share-editable-false').attr('checked', true); $rights.find('#cp-share-editable-true').removeAttr('checked').attr('disabled', true); @@ -1282,7 +1283,7 @@ define([ onClick: function () { var v = getLinkValue(); var success = Clipboard.copy(v); - if (success) { UI.log(Messages.shareSuccess); + if (success) { UI.log(Messages.shareSuccess); } }, keys: [13] @@ -1294,7 +1295,7 @@ define([ onClose: config.onClose, }); - // share with contacts tab + // share with contacts tab var hasFriends = Object.keys(config.friends || {}).length !== 0; var friendsObject = hasFriends ? createShareWithFriends(config, null, getLinkValue) : { @@ -1369,7 +1370,6 @@ define([ return modal; }; - UIElements.createInviteTeamModal = function (config) { var common = config.common; var hasFriends = Object.keys(config.friends || {}).length !== 0; @@ -2346,7 +2346,7 @@ define([ prettyUsage = Messages._getKey('formattedMB', [usage]); prettyLimit = Messages._getKey('formattedMB', [limit]); } - + if (quota < 0.8) { $usage.addClass('cp-limit-usage-normal'); } else if (quota < 1) { $usage.addClass('cp-limit-usage-warning'); } else { $usage.addClass('cp-limit-usage-above'); } @@ -3526,15 +3526,16 @@ define([ if (isError) { error = setHTML(h('p.cp-password-error'), Messages.password_error); } var info = h('p.cp-password-info', Messages.password_info); var password = UI.passwordInput({placeholder: Messages.password_placeholder}); + var $password = $(password); var button = h('button', Messages.password_submit); cfg = cfg || {}; if (cfg.value && !isError) { - $(password).find('.cp-password-input').val(cfg.value); + $password.find('.cp-password-input').val(cfg.value); } var submit = function () { - var value = $(password).find('.cp-password-input').val(); + var value = $password.find('.cp-password-input').val(); UI.addLoadingScreen(); common.getSframeChannel().query('Q_PAD_PASSWORD_VALUE', value, function (err, data) { if (!data) { @@ -3542,7 +3543,7 @@ define([ } }); }; - $(password).find('.cp-password-input').on('keydown', function (e) { if (e.which === 13) { submit(); } }); + $password.find('.cp-password-input').on('keydown', function (e) { if (e.which === 13) { submit(); } }); $(button).on('click', function () { submit(); }); @@ -3556,7 +3557,7 @@ define([ ]); UI.errorLoadingScreen(block); - $(password).find('.cp-password-input').focus(); + $password.find('.cp-password-input').focus(); }; var crowdfundingState = false;