diff --git a/core/.eslintrc.passing.json b/core/.eslintrc.passing.json index ed5c4c2b3ee15e257fecc3acee6d433c53ea2497..15c2657178e6cf13b6ad09a912f31d3a38b3e853 100644 --- a/core/.eslintrc.passing.json +++ b/core/.eslintrc.passing.json @@ -8,7 +8,6 @@ "max-len": "off", "default-case": "off", "prefer-destructuring": "off", - "object-curly-newline": "off", "operator-linebreak": "off", "no-else-return": "off", "no-restricted-globals": "off", diff --git a/core/modules/editor/js/editor.admin.es6.js b/core/modules/editor/js/editor.admin.es6.js index c390d659b417212cf43d309afce40072f9bb0951..3b5a7aace047e11eb4852c6c6a068c5a336534fc 100644 --- a/core/modules/editor/js/editor.admin.es6.js +++ b/core/modules/editor/js/editor.admin.es6.js @@ -610,25 +610,35 @@ Drupal.EditorFeatureHTMLRule = function () { /** * - * @type {object} + * @type {Object} * * @prop {Array} tags * @prop {Array} attributes * @prop {Array} styles * @prop {Array} classes */ - this.required = { tags: [], attributes: [], styles: [], classes: [] }; + this.required = { + tags: [], + attributes: [], + styles: [], + classes: [], + }; /** * - * @type {object} + * @type {Object} * * @prop {Array} tags * @prop {Array} attributes * @prop {Array} styles * @prop {Array} classes */ - this.allowed = { tags: [], attributes: [], styles: [], classes: [] }; + this.allowed = { + tags: [], + attributes: [], + styles: [], + classes: [], + }; /** * diff --git a/core/modules/editor/js/editor.admin.js b/core/modules/editor/js/editor.admin.js index 3d88c936686ee9928af979bef90cf33adb932a17..b229620ad40130f3deba872ff1d5390cece36c11 100644 --- a/core/modules/editor/js/editor.admin.js +++ b/core/modules/editor/js/editor.admin.js @@ -263,9 +263,19 @@ }; Drupal.EditorFeatureHTMLRule = function () { - this.required = { tags: [], attributes: [], styles: [], classes: [] }; + this.required = { + tags: [], + attributes: [], + styles: [], + classes: [] + }; - this.allowed = { tags: [], attributes: [], styles: [], classes: [] }; + this.allowed = { + tags: [], + attributes: [], + styles: [], + classes: [] + }; this.raw = null; }; diff --git a/core/modules/editor/js/editor.formattedTextEditor.es6.js b/core/modules/editor/js/editor.formattedTextEditor.es6.js index 1da8d6f0d163e2fc822328406f8fba27c23af516..485154828013be5de49fe49239746876d10b4fd2 100644 --- a/core/modules/editor/js/editor.formattedTextEditor.es6.js +++ b/core/modules/editor/js/editor.formattedTextEditor.es6.js @@ -180,10 +180,15 @@ * @inheritdoc * * @return {object} - * The sttings for the quick edit UI. + * The settings for the quick edit UI. */ getQuickEditUISettings() { - return { padding: true, unifiedToolbar: true, fullWidthToolbar: true, popup: false }; + return { + padding: true, + unifiedToolbar: true, + fullWidthToolbar: true, + popup: false, + }; }, /** diff --git a/core/modules/editor/js/editor.formattedTextEditor.js b/core/modules/editor/js/editor.formattedTextEditor.js index 3d74aaba0558698aebb997724c5d65470cde50ca..0935cbc3845eaac13591a0636947c5f3801706e1 100644 --- a/core/modules/editor/js/editor.formattedTextEditor.js +++ b/core/modules/editor/js/editor.formattedTextEditor.js @@ -104,7 +104,12 @@ } }, getQuickEditUISettings: function getQuickEditUISettings() { - return { padding: true, unifiedToolbar: true, fullWidthToolbar: true, popup: false }; + return { + padding: true, + unifiedToolbar: true, + fullWidthToolbar: true, + popup: false + }; }, revert: function revert() { this.$textElement.html(this.model.get('originalValue')); diff --git a/core/modules/image/js/editors/image.es6.js b/core/modules/image/js/editors/image.es6.js index 01442e5da307076a78437c0507c489fc16c848b8..617223a012bb451249329befdf621b3ffef059bb 100644 --- a/core/modules/image/js/editors/image.es6.js +++ b/core/modules/image/js/editors/image.es6.js @@ -307,7 +307,12 @@ * @inheritdoc */ getQuickEditUISettings() { - return { padding: false, unifiedToolbar: true, fullWidthToolbar: true, popup: false }; + return { + padding: false, + unifiedToolbar: true, + fullWidthToolbar: true, + popup: false, + }; }, /** diff --git a/core/modules/image/js/editors/image.js b/core/modules/image/js/editors/image.js index 95646cd76465e02e323f8996b41a7d6e870e20f5..f46da9f46b3cce125efe1353e7c113b6aa9d9fc6 100644 --- a/core/modules/image/js/editors/image.js +++ b/core/modules/image/js/editors/image.js @@ -203,7 +203,12 @@ this.$el.html(this.model.get('originalValue')); }, getQuickEditUISettings: function getQuickEditUISettings() { - return { padding: false, unifiedToolbar: true, fullWidthToolbar: true, popup: false }; + return { + padding: false, + unifiedToolbar: true, + fullWidthToolbar: true, + popup: false + }; }, showValidationErrors: function showValidationErrors() { var errors = Drupal.theme('quickeditImageErrors', { diff --git a/core/modules/quickedit/js/editors/formEditor.es6.js b/core/modules/quickedit/js/editors/formEditor.es6.js index f2eb3f03239509a451146720c66cef4e4287a5e7..b4601af7a4cdd9b04a66a6613cda93f64a67e63d 100644 --- a/core/modules/quickedit/js/editors/formEditor.es6.js +++ b/core/modules/quickedit/js/editors/formEditor.es6.js @@ -82,7 +82,12 @@ * A settings object for the quick edit UI. */ getQuickEditUISettings() { - return { padding: true, unifiedToolbar: true, fullWidthToolbar: true, popup: true }; + return { + padding: true, + unifiedToolbar: true, + fullWidthToolbar: true, + popup: true, + }; }, /** diff --git a/core/modules/quickedit/js/editors/formEditor.js b/core/modules/quickedit/js/editors/formEditor.js index 1ef1fa4077a541aa283b0d99d95a8b8e4ac857cc..a53bc79e7b6d41daf318fd635cf8a9f694dd1767 100644 --- a/core/modules/quickedit/js/editors/formEditor.js +++ b/core/modules/quickedit/js/editors/formEditor.js @@ -52,7 +52,12 @@ } }, getQuickEditUISettings: function getQuickEditUISettings() { - return { padding: true, unifiedToolbar: true, fullWidthToolbar: true, popup: true }; + return { + padding: true, + unifiedToolbar: true, + fullWidthToolbar: true, + popup: true + }; }, loadForm: function loadForm() { var fieldModel = this.fieldModel; diff --git a/core/modules/quickedit/js/editors/plainTextEditor.es6.js b/core/modules/quickedit/js/editors/plainTextEditor.es6.js index 92e5a5dd0f9bb9795d22895412b11c354cba13f4..c33508768704bd85bd0eff40134d57d40a05882b 100644 --- a/core/modules/quickedit/js/editors/plainTextEditor.es6.js +++ b/core/modules/quickedit/js/editors/plainTextEditor.es6.js @@ -121,7 +121,12 @@ * A settings object for the quick edit UI. */ getQuickEditUISettings() { - return { padding: true, unifiedToolbar: false, fullWidthToolbar: false, popup: false }; + return { + padding: true, + unifiedToolbar: false, + fullWidthToolbar: false, + popup: false, + }; }, /** diff --git a/core/modules/quickedit/js/editors/plainTextEditor.js b/core/modules/quickedit/js/editors/plainTextEditor.js index dde834b86900d79e45116802db79e694eaf11b1a..0843bb82ba3aa98fa09892839a16fbb7eb8ec1fa 100644 --- a/core/modules/quickedit/js/editors/plainTextEditor.js +++ b/core/modules/quickedit/js/editors/plainTextEditor.js @@ -81,7 +81,12 @@ } }, getQuickEditUISettings: function getQuickEditUISettings() { - return { padding: true, unifiedToolbar: false, fullWidthToolbar: false, popup: false }; + return { + padding: true, + unifiedToolbar: false, + fullWidthToolbar: false, + popup: false + }; }, revert: function revert() { this.$textElement.html(this.model.get('originalValue')); diff --git a/core/modules/quickedit/js/quickedit.es6.js b/core/modules/quickedit/js/quickedit.es6.js index eaacc3b6c51dc595c0e305d5f22355f54191055c..e4c35b13dd6b24a84db264055627c3b3c10851a2 100644 --- a/core/modules/quickedit/js/quickedit.es6.js +++ b/core/modules/quickedit/js/quickedit.es6.js @@ -358,7 +358,12 @@ // Otherwise: queue the field. It is now available to be set up when its // corresponding entity becomes in-place editable. else { - fieldsAvailableQueue.push({ el: fieldElement, fieldID, entityID, entityInstanceID }); + fieldsAvailableQueue.push({ + el: fieldElement, + fieldID, + entityID, + entityInstanceID, + }); } } diff --git a/core/modules/quickedit/js/quickedit.js b/core/modules/quickedit/js/quickedit.js index 1c677aa1e904b2d4c2af3405a428a86633824d34..4d49eb557a5f977aa330aaafc6c1256ac3c8bb71 100644 --- a/core/modules/quickedit/js/quickedit.js +++ b/core/modules/quickedit/js/quickedit.js @@ -201,7 +201,12 @@ if (Drupal.quickedit.collections.entities.findWhere({ entityID: entityID, entityInstanceID: entityInstanceID })) { initializeField(fieldElement, fieldID, entityID, entityInstanceID); } else { - fieldsAvailableQueue.push({ el: fieldElement, fieldID: fieldID, entityID: entityID, entityInstanceID: entityInstanceID }); + fieldsAvailableQueue.push({ + el: fieldElement, + fieldID: fieldID, + entityID: entityID, + entityInstanceID: entityInstanceID + }); } } diff --git a/core/modules/quickedit/js/views/EditorView.es6.js b/core/modules/quickedit/js/views/EditorView.es6.js index 1a1a9845d53d9748d7f437ba01707b87bdb2985b..8de1c3f4d09699ba5bf379e15ac669ff0f9597e5 100644 --- a/core/modules/quickedit/js/views/EditorView.es6.js +++ b/core/modules/quickedit/js/views/EditorView.es6.js @@ -83,7 +83,12 @@ * rather than being just long enough to accommodate a label. */ getQuickEditUISettings() { - return { padding: false, unifiedToolbar: false, fullWidthToolbar: false, popup: false }; + return { + padding: false, + unifiedToolbar: false, + fullWidthToolbar: false, + popup: false, + }; }, /** diff --git a/core/modules/quickedit/js/views/EditorView.js b/core/modules/quickedit/js/views/EditorView.js index f69238c2a34d41beacc689f90f87c1e21e3a504d..eb9800b6d31b59d9a25bf4234a74ca7de909c879 100644 --- a/core/modules/quickedit/js/views/EditorView.js +++ b/core/modules/quickedit/js/views/EditorView.js @@ -19,7 +19,12 @@ return this.$el; }, getQuickEditUISettings: function getQuickEditUISettings() { - return { padding: false, unifiedToolbar: false, fullWidthToolbar: false, popup: false }; + return { + padding: false, + unifiedToolbar: false, + fullWidthToolbar: false, + popup: false + }; }, stateChange: function stateChange(fieldModel, state) { var from = fieldModel.previous('state');