diff --git a/core/.eslintrc.passing.json b/core/.eslintrc.passing.json
index 15c2657178e6cf13b6ad09a912f31d3a38b3e853..abb9a63c1f0fed1bb280143cd18d79d9557f7989 100644
--- a/core/.eslintrc.passing.json
+++ b/core/.eslintrc.passing.json
@@ -9,7 +9,6 @@
"default-case": "off",
"prefer-destructuring": "off",
"operator-linebreak": "off",
- "no-else-return": "off",
"no-restricted-globals": "off",
"react/no-this-in-sfc": "off",
"react/destructuring-assignment": "off",
diff --git a/core/misc/tabledrag.es6.js b/core/misc/tabledrag.es6.js
index 29e8e03e6faad0109ee1f7f082c4e700b8442429..93cc0349c23eb01d741aa12de547848429a59b55 100644
--- a/core/misc/tabledrag.es6.js
+++ b/core/misc/tabledrag.es6.js
@@ -1107,7 +1107,7 @@
delta = (delta > 0 && delta < trigger) ? delta : trigger;
return delta * this.scrollSettings.amount;
}
- else if (cursorY - scrollY < trigger) {
+ if (cursorY - scrollY < trigger) {
delta = trigger / (cursorY - scrollY);
delta = (delta > 0 && delta < trigger) ? delta : trigger;
return -delta * this.scrollSettings.amount;
diff --git a/core/misc/tabledrag.js b/core/misc/tabledrag.js
index 3330aeb8bb694ac74431e0f2b26d18bf8ff3a738..97ead1c69ab475afa70a20c33c0fb741897fc681 100644
--- a/core/misc/tabledrag.js
+++ b/core/misc/tabledrag.js
@@ -725,7 +725,8 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
delta = trigger / (windowHeight + scrollY - cursorY);
delta = delta > 0 && delta < trigger ? delta : trigger;
return delta * this.scrollSettings.amount;
- } else if (cursorY - scrollY < trigger) {
+ }
+ if (cursorY - scrollY < trigger) {
delta = trigger / (cursorY - scrollY);
delta = delta > 0 && delta < trigger ? delta : trigger;
return -delta * this.scrollSettings.amount;
diff --git a/core/modules/book/book.es6.js b/core/modules/book/book.es6.js
index c04929bf2041706f4822122221f78603d22a8327..5458e614f2c514a65ba04d9cdde49fb7b0acdfe9 100644
--- a/core/modules/book/book.es6.js
+++ b/core/modules/book/book.es6.js
@@ -21,7 +21,7 @@
if (val === '0') {
return Drupal.t('Not in book');
}
- else if (val === 'new') {
+ if (val === 'new') {
return Drupal.t('New book');
}
diff --git a/core/modules/book/book.js b/core/modules/book/book.js
index 9000c932582c39e44541736d01eaa0279ec1ea13..0ed6601a6a9ab7ffbae812234a4951200aa60451 100644
--- a/core/modules/book/book.js
+++ b/core/modules/book/book.js
@@ -14,7 +14,8 @@
if (val === '0') {
return Drupal.t('Not in book');
- } else if (val === 'new') {
+ }
+ if (val === 'new') {
return Drupal.t('New book');
}
diff --git a/core/modules/ckeditor/js/plugins/drupalimage/plugin.es6.js b/core/modules/ckeditor/js/plugins/drupalimage/plugin.es6.js
index 94f92e6b904644c198a2014cd31ff5724c98ee60..ec512440a3b9e5505d6561f2bf30b16f5b45d396 100644
--- a/core/modules/ckeditor/js/plugins/drupalimage/plugin.es6.js
+++ b/core/modules/ckeditor/js/plugins/drupalimage/plugin.es6.js
@@ -159,7 +159,7 @@
return;
}
// Don't initialize on pasted fake objects.
- else if (element.attributes['data-cke-realelement']) {
+ if (element.attributes['data-cke-realelement']) {
return;
}
diff --git a/core/modules/ckeditor/js/plugins/drupalimage/plugin.js b/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
index 8176a72a524e5ee856f5ffc5023b5fd767cd844b..72180faa8eb388c20e65541929a5bbf4e07d78f2 100644
--- a/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
+++ b/core/modules/ckeditor/js/plugins/drupalimage/plugin.js
@@ -95,9 +95,11 @@
widgetDefinition.upcast = function (element, data) {
if (element.name !== 'img') {
return;
- } else if (element.attributes['data-cke-realelement']) {
- return;
- }
+ }
+
+ if (element.attributes['data-cke-realelement']) {
+ return;
+ }
data['data-entity-type'] = element.attributes['data-entity-type'];
diff --git a/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.es6.js b/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.es6.js
index 140a18420703ea6450bc014809733526abfac371..6b6a09e23a019f1b08de1c3de2fde010803230bb 100644
--- a/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.es6.js
+++ b/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.es6.js
@@ -139,7 +139,7 @@
return;
}
// Don't initialize on pasted fake objects.
- else if (element.attributes['data-cke-realelement']) {
+ if (element.attributes['data-cke-realelement']) {
return;
}
diff --git a/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.js b/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.js
index d19f3b3adc5282f17b8939f82a6464673479580d..7cd215a70589c674a9afa4badca054a250350e97 100644
--- a/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.js
+++ b/core/modules/ckeditor/js/plugins/drupalimagecaption/plugin.js
@@ -88,9 +88,11 @@
widgetDefinition.upcast = function (element, data) {
if (element.name !== 'img' || !element.attributes['data-entity-type'] || !element.attributes['data-entity-uuid']) {
return;
- } else if (element.attributes['data-cke-realelement']) {
- return;
- }
+ }
+
+ if (element.attributes['data-cke-realelement']) {
+ return;
+ }
element = originalUpcast.call(this, element, data);
var attrs = element.attributes;
diff --git a/core/modules/media/js/form.es6.js b/core/modules/media/js/form.es6.js
index cb0da60dc8f986c3d301685d627d0ee531f0ae2d..73948c0f58006b389fe985af95a89ccee46e7cc4 100644
--- a/core/modules/media/js/form.es6.js
+++ b/core/modules/media/js/form.es6.js
@@ -24,10 +24,10 @@
if (name && date) {
return Drupal.t('By @name on @date', { '@name': name, '@date': date });
}
- else if (name) {
+ if (name) {
return Drupal.t('By @name', { '@name': name });
}
- else if (date) {
+ if (date) {
return Drupal.t('Authored on @date', { '@date': date });
}
});
diff --git a/core/modules/media/js/form.js b/core/modules/media/js/form.js
index d033ec50d68d0063f228f0b408756b1817e64dd4..09394c4c6ba6029c190d30316c459ed11b31e6ca 100644
--- a/core/modules/media/js/form.js
+++ b/core/modules/media/js/form.js
@@ -17,9 +17,11 @@
if (name && date) {
return Drupal.t('By @name on @date', { '@name': name, '@date': date });
- } else if (name) {
+ }
+ if (name) {
return Drupal.t('By @name', { '@name': name });
- } else if (date) {
+ }
+ if (date) {
return Drupal.t('Authored on @date', { '@date': date });
}
});
diff --git a/core/modules/node/node.es6.js b/core/modules/node/node.es6.js
index 6d6beb92fbc0ec2cd3c52b183b97e7d3bf5d2f07..26d0792e5d28f71909ef961dee9731d2cf9d845d 100644
--- a/core/modules/node/node.es6.js
+++ b/core/modules/node/node.es6.js
@@ -24,10 +24,10 @@
if (name && date) {
return Drupal.t('By @name on @date', { '@name': name, '@date': date });
}
- else if (name) {
+ if (name) {
return Drupal.t('By @name', { '@name': name });
}
- else if (date) {
+ if (date) {
return Drupal.t('Authored on @date', { '@date': date });
}
});
diff --git a/core/modules/node/node.js b/core/modules/node/node.js
index fc2da8818307f96ab83a683e7ad9af5580075933..b7fbae02c0e5a892d0f8d35789ffc1c332567fb5 100644
--- a/core/modules/node/node.js
+++ b/core/modules/node/node.js
@@ -17,9 +17,11 @@
if (name && date) {
return Drupal.t('By @name on @date', { '@name': name, '@date': date });
- } else if (name) {
+ }
+ if (name) {
return Drupal.t('By @name', { '@name': name });
- } else if (date) {
+ }
+ if (date) {
return Drupal.t('Authored on @date', { '@date': date });
}
});
diff --git a/core/modules/quickedit/js/models/EntityModel.es6.js b/core/modules/quickedit/js/models/EntityModel.es6.js
index 4ea83713562dd76d78f97095fbb929c13153dad7..3fb7cdd6f7f1e726501f7580684aaa4db6ce0287 100644
--- a/core/modules/quickedit/js/models/EntityModel.es6.js
+++ b/core/modules/quickedit/js/models/EntityModel.es6.js
@@ -514,7 +514,7 @@
}
// If that function accepts it, then ensure all fields are also in an
// acceptable state.
- else if (!this._fieldsHaveAcceptableStates(acceptedFieldStates)) {
+ if (!this._fieldsHaveAcceptableStates(acceptedFieldStates)) {
return 'state change not accepted because fields are not in acceptable state';
}
}
diff --git a/core/modules/quickedit/js/models/EntityModel.js b/core/modules/quickedit/js/models/EntityModel.js
index 3c55c6ab417dbe5e0d383000e4d7ef37498039f6..15584400a7dd7e1684699b3270e5e113a965cc1a 100644
--- a/core/modules/quickedit/js/models/EntityModel.js
+++ b/core/modules/quickedit/js/models/EntityModel.js
@@ -256,9 +256,11 @@
if (!this._acceptStateChange(currentState, nextState, options)) {
return 'state change not accepted';
- } else if (!this._fieldsHaveAcceptableStates(acceptedFieldStates)) {
- return 'state change not accepted because fields are not in acceptable state';
- }
+ }
+
+ if (!this._fieldsHaveAcceptableStates(acceptedFieldStates)) {
+ return 'state change not accepted because fields are not in acceptable state';
+ }
}
var currentIsCommitting = this.get('isCommitting');
diff --git a/core/modules/quickedit/js/quickedit.es6.js b/core/modules/quickedit/js/quickedit.es6.js
index e4c35b13dd6b24a84db264055627c3b3c10851a2..145c26dc1a94636f7bdf5857fed19da760fc66b7 100644
--- a/core/modules/quickedit/js/quickedit.es6.js
+++ b/core/modules/quickedit/js/quickedit.es6.js
@@ -236,7 +236,7 @@
// The entity for the given contextual link contains at least one field that
// the current user may edit in-place; instantiate EntityModel,
// EntityDecorationView and ContextualLinkView.
- else if (hasFieldWithPermission(fieldIDs)) {
+ if (hasFieldWithPermission(fieldIDs)) {
const entityModel = new Drupal.quickedit.EntityModel({
el: contextualLink.region,
entityID: contextualLink.entityID,
@@ -278,7 +278,7 @@
}
// There was not at least one field that the current user may edit in-place,
// even though the metadata for all fields within this entity is available.
- else if (allMetadataExists(fieldIDs)) {
+ if (allMetadataExists(fieldIDs)) {
return true;
}
diff --git a/core/modules/quickedit/js/quickedit.js b/core/modules/quickedit/js/quickedit.js
index 4d49eb557a5f977aa330aaafc6c1256ac3c8bb71..d8317da841b5e6548f4e342e798c43b7db2ebe6d 100644
--- a/core/modules/quickedit/js/quickedit.js
+++ b/core/modules/quickedit/js/quickedit.js
@@ -120,43 +120,47 @@
if (fieldIDs.length === 0) {
return false;
- } else if (hasFieldWithPermission(fieldIDs)) {
- var entityModel = new Drupal.quickedit.EntityModel({
- el: contextualLink.region,
- entityID: contextualLink.entityID,
- entityInstanceID: contextualLink.entityInstanceID,
- id: contextualLink.entityID + '[' + contextualLink.entityInstanceID + ']',
- label: Drupal.quickedit.metadata.get(contextualLink.entityID, 'label')
- });
- Drupal.quickedit.collections.entities.add(entityModel);
+ }
- var entityDecorationView = new Drupal.quickedit.EntityDecorationView({
- el: contextualLink.region,
- model: entityModel
- });
- entityModel.set('entityDecorationView', entityDecorationView);
+ if (hasFieldWithPermission(fieldIDs)) {
+ var entityModel = new Drupal.quickedit.EntityModel({
+ el: contextualLink.region,
+ entityID: contextualLink.entityID,
+ entityInstanceID: contextualLink.entityInstanceID,
+ id: contextualLink.entityID + '[' + contextualLink.entityInstanceID + ']',
+ label: Drupal.quickedit.metadata.get(contextualLink.entityID, 'label')
+ });
+ Drupal.quickedit.collections.entities.add(entityModel);
- _.each(fields, function (field) {
- initializeField(field.el, field.fieldID, contextualLink.entityID, contextualLink.entityInstanceID);
- });
- fieldsAvailableQueue = _.difference(fieldsAvailableQueue, fields);
-
- var initContextualLink = _.once(function () {
- var $links = $(contextualLink.el).find('.contextual-links');
- var contextualLinkView = new Drupal.quickedit.ContextualLinkView($.extend({
- el: $('<li class="quickedit"><a href="" role="button" aria-pressed="false"></a></li>').prependTo($links),
- model: entityModel,
- appModel: Drupal.quickedit.app.model
- }, options));
- entityModel.set('contextualLinkView', contextualLinkView);
- });
+ var entityDecorationView = new Drupal.quickedit.EntityDecorationView({
+ el: contextualLink.region,
+ model: entityModel
+ });
+ entityModel.set('entityDecorationView', entityDecorationView);
- loadMissingEditors(initContextualLink);
+ _.each(fields, function (field) {
+ initializeField(field.el, field.fieldID, contextualLink.entityID, contextualLink.entityInstanceID);
+ });
+ fieldsAvailableQueue = _.difference(fieldsAvailableQueue, fields);
+
+ var initContextualLink = _.once(function () {
+ var $links = $(contextualLink.el).find('.contextual-links');
+ var contextualLinkView = new Drupal.quickedit.ContextualLinkView($.extend({
+ el: $('<li class="quickedit"><a href="" role="button" aria-pressed="false"></a></li>').prependTo($links),
+ model: entityModel,
+ appModel: Drupal.quickedit.app.model
+ }, options));
+ entityModel.set('contextualLinkView', contextualLinkView);
+ });
- return true;
- } else if (allMetadataExists(fieldIDs)) {
- return true;
- }
+ loadMissingEditors(initContextualLink);
+
+ return true;
+ }
+
+ if (allMetadataExists(fieldIDs)) {
+ return true;
+ }
return false;
}