From 7655c870049ef11bff441c85208f4bc0d550d651 Mon Sep 17 00:00:00 2001
From: xjm <xjm@65776.no-reply.drupal.org>
Date: Fri, 13 Oct 2017 19:10:51 -0500
Subject: [PATCH] Issue #2914718 by droplet, alexpott, nod_, dawehner: JS
codestyle: no-empty
---
core/.eslintrc.passing.json | 1 -
core/modules/quickedit/js/models/FieldModel.es6.js | 11 ++---------
core/modules/quickedit/js/models/FieldModel.js | 6 +++---
3 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/core/.eslintrc.passing.json b/core/.eslintrc.passing.json
index 918039125429..05bd17608712 100644
--- a/core/.eslintrc.passing.json
+++ b/core/.eslintrc.passing.json
@@ -8,7 +8,6 @@
"no-restricted-syntax": "off",
"no-new": "off",
"no-multi-assign": "off",
- "no-empty": "off",
"no-continue": "off",
"new-cap": "off",
"max-len": "off",
diff --git a/core/modules/quickedit/js/models/FieldModel.es6.js b/core/modules/quickedit/js/models/FieldModel.es6.js
index 776c331f32fd..0c01cc302406 100644
--- a/core/modules/quickedit/js/models/FieldModel.es6.js
+++ b/core/modules/quickedit/js/models/FieldModel.es6.js
@@ -218,15 +218,8 @@
// different view mode).
.where({ logicalFieldID: currentField.get('logicalFieldID') })
.forEach((field) => {
- // Ignore the current field.
- if (field === currentField) {
-
- }
- // Also ignore other fields with the same view mode.
- else if (field.get('fieldID') === currentField.get('fieldID')) {
-
- }
- else {
+ // Ignore the current field and other fields with the same view mode.
+ if (field !== currentField && field.get('fieldID') !== currentField.get('fieldID')) {
otherViewModes.push(field.getViewMode());
}
});
diff --git a/core/modules/quickedit/js/models/FieldModel.js b/core/modules/quickedit/js/models/FieldModel.js
index f3c6cd582c54..b44ce5fb475b 100644
--- a/core/modules/quickedit/js/models/FieldModel.js
+++ b/core/modules/quickedit/js/models/FieldModel.js
@@ -72,9 +72,9 @@
var currentField = this;
var otherViewModes = [];
Drupal.quickedit.collections.fields.where({ logicalFieldID: currentField.get('logicalFieldID') }).forEach(function (field) {
- if (field === currentField) {} else if (field.get('fieldID') === currentField.get('fieldID')) {} else {
- otherViewModes.push(field.getViewMode());
- }
+ if (field !== currentField && field.get('fieldID') !== currentField.get('fieldID')) {
+ otherViewModes.push(field.getViewMode());
+ }
});
return otherViewModes;
}
--
GitLab