diff options
author | Lauri Ojansivu <x@xet7.org> | 2020-05-24 18:56:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-24 18:56:36 +0300 |
commit | 01346152b59255661c6c2e0fba149b4d41a801a1 (patch) | |
tree | fe507aa6abdff9101dbf52630e1ee0e3c803b630 | |
parent | 5b7b5b3e7ed4596c57d17f67a9c11d7a460877f6 (diff) | |
parent | 6e088af3d13b3b5912b783b485681bbd44ea4427 (diff) | |
download | wekan-01346152b59255661c6c2e0fba149b4d41a801a1.tar.gz wekan-01346152b59255661c6c2e0fba149b4d41a801a1.tar.bz2 wekan-01346152b59255661c6c2e0fba149b4d41a801a1.zip |
Merge pull request #3112 from marc1006/deepcode
Some fixes suggested by deepcode.ai
-rw-r--r-- | client/components/boards/boardBody.js | 8 | ||||
-rw-r--r-- | client/components/cards/cardDetails.js | 4 | ||||
-rw-r--r-- | client/components/rules/actions/cardActions.js | 1 | ||||
-rw-r--r-- | client/components/sidebar/sidebar.js | 2 | ||||
-rw-r--r-- | client/lib/dropImage.js | 4 | ||||
-rw-r--r-- | client/lib/pasteImage.js | 2 | ||||
-rw-r--r-- | models/checklists.js | 6 | ||||
-rw-r--r-- | models/settings.js | 2 | ||||
-rw-r--r-- | server/rulesHelper.js | 2 |
9 files changed, 16 insertions, 15 deletions
diff --git a/client/components/boards/boardBody.js b/client/components/boards/boardBody.js index 4e473f18..e70faa49 100644 --- a/client/components/boards/boardBody.js +++ b/client/components/boards/boardBody.js @@ -365,12 +365,12 @@ BlazeComponent.extendComponent({ }; currentBoard .cardsInInterval(start.toDate(), end.toDate()) - .forEach(function(card) { + .forEach(card => { pushEvent(card); }); currentBoard .cardsDueInBetween(start.toDate(), end.toDate()) - .forEach(function(card) { + .forEach(card => { pushEvent( card, `${card.title} ${TAPi18n.__('card-due')}`, @@ -378,8 +378,8 @@ BlazeComponent.extendComponent({ new Date(card.dueAt.getTime() + 36e5), ); }); - events.sort(function(first, second) { - return first.id > second.id ? 1 : -1; + events.sort((first, second) => { + return first.id === second.id ? 0 : first.id > second.id ? 1 : -1; }); callback(events); }, diff --git a/client/components/cards/cardDetails.js b/client/components/cards/cardDetails.js index 11e010d4..d877421c 100644 --- a/client/components/cards/cardDetails.js +++ b/client/components/cards/cardDetails.js @@ -812,9 +812,9 @@ Template.copyChecklistToManyCardsPopup.events({ // copy subtasks cursor = Cards.find({ parentId: oldId }); - cursor.forEach(function() { + cursor.forEach(cur => { 'use strict'; - const subtask = arguments[0]; + const subtask = cur; subtask.parentId = _id; subtask._id = null; /* const newSubtaskId = */ Cards.insert(subtask); diff --git a/client/components/rules/actions/cardActions.js b/client/components/rules/actions/cardActions.js index 7dc6c2b5..2290249c 100644 --- a/client/components/rules/actions/cardActions.js +++ b/client/components/rules/actions/cardActions.js @@ -164,6 +164,7 @@ BlazeComponent.extendComponent({ const boardId = Session.get('currentBoard'); const actionId = Actions.insert({ actionType: 'removeMember', + // deepcode ignore NoHardcodedCredentials: it's no credential username: '*', boardId, desc, diff --git a/client/components/sidebar/sidebar.js b/client/components/sidebar/sidebar.js index 0e535041..7b14c1e0 100644 --- a/client/components/sidebar/sidebar.js +++ b/client/components/sidebar/sidebar.js @@ -653,7 +653,7 @@ BlazeComponent.extendComponent({ 'subtext-with-parent', 'no-parent', ]; - options.forEach(function(element) { + options.forEach(element => { if (element !== value) { $(`#${element} ${MCB}`).toggleClass(CKCLS, false); $(`#${element}`).toggleClass(CKCLS, false); diff --git a/client/lib/dropImage.js b/client/lib/dropImage.js index f4e1d8ab..559754f4 100644 --- a/client/lib/dropImage.js +++ b/client/lib/dropImage.js @@ -39,8 +39,8 @@ }; return this.each(function() { const element = this; - $(element).bind('dragenter dragover dragleave', stopFn); - return $(element).bind('drop', function(event) { + $(element).on('dragenter dragover dragleave', stopFn); + return $(element).on('drop', function(event) { stopFn(event); const files = event.dataTransfer.files; for (let i = 0; i < files.length; i++) { diff --git a/client/lib/pasteImage.js b/client/lib/pasteImage.js index e6f8c6c2..195a781d 100644 --- a/client/lib/pasteImage.js +++ b/client/lib/pasteImage.js @@ -35,7 +35,7 @@ options = $.extend({}, defaults, options); return this.each(function() { const element = this; - return $(element).bind('paste', function(event) { + return $(element).on('paste', function(event) { const types = event.clipboardData.types; const items = event.clipboardData.items; for (let i = 0; i < types.length; i++) { diff --git a/models/checklists.js b/models/checklists.js index cf73e500..62c71d5f 100644 --- a/models/checklists.js +++ b/models/checklists.js @@ -100,13 +100,13 @@ Checklists.helpers({ }, checkAllItems() { const checkItems = ChecklistItems.find({ checklistId: this._id }); - checkItems.forEach(function(item) { + checkItems.forEach(item => { item.check(); }); }, uncheckAllItems() { const checkItems = ChecklistItems.find({ checklistId: this._id }); - checkItems.forEach(function(item) { + checkItems.forEach(item => { item.uncheck(); }); }, @@ -307,7 +307,7 @@ if (Meteor.isServer) { items = [items]; } } - items.forEach(function(item, idx) { + items.forEach((item, idx) => { ChecklistItems.insert({ cardId: paramCardId, checklistId: id, diff --git a/models/settings.js b/models/settings.js index fb823205..b665642e 100644 --- a/models/settings.js +++ b/models/settings.js @@ -259,7 +259,7 @@ if (Meteor.isServer) { throw new Meteor.Error('invalid-user'); } const user = Meteor.user(); - if (!user.emails && !user.emails[0] && user.emails[0].address) { + if (!user.emails || !user.emails[0] || user.emails[0].address) { throw new Meteor.Error('email-invalid'); } this.unblock(); diff --git a/server/rulesHelper.js b/server/rulesHelper.js index 63e330ab..1dc7b5d3 100644 --- a/server/rulesHelper.js +++ b/server/rulesHelper.js @@ -17,7 +17,7 @@ RulesHelper = { const matchingMap = this.buildMatchingFieldsMap(activity, matchingFields); const matchingTriggers = Triggers.find(matchingMap); const matchingRules = []; - matchingTriggers.forEach(function(trigger) { + matchingTriggers.forEach(trigger => { const rule = trigger.getRule(); // Check that for some unknown reason there are some leftover triggers // not connected to any rules |