From 482e990f556a87949716f9d0fadad7f1d52225dd Mon Sep 17 00:00:00 2001 From: Yannick Schaus Date: Tue, 9 Mar 2021 17:28:52 +0100 Subject: [PATCH] Never put closing brackets on newlines (vue/html-closing-bracket-newline) Signed-off-by: Yannick Schaus --- bundles/org.openhab.ui/web/.eslintrc.js | 2 +- .../org.openhab.ui/web/src/components/app.vue | 42 ++++------- .../src/components/cards/location-card.vue | 6 +- .../web/src/components/cards/model-card.vue | 3 +- .../components/config/config-parameter.vue | 3 +- .../src/components/config/config-sheet.vue | 6 +- .../config/controls/location-picker.vue | 6 +- .../controls/parameter-cronexpression.vue | 3 +- .../config/controls/parameter-dayofweek.vue | 3 +- .../config/controls/parameter-location.vue | 3 +- .../config/controls/parameter-number.vue | 3 +- .../config/controls/parameter-options.vue | 12 ++-- .../config/controls/parameter-pagewidget.vue | 3 +- .../config/controls/parameter-qrcode.vue | 3 +- .../config/controls/parameter-script.vue | 3 +- .../config/controls/parameter-text.vue | 3 +- .../config/controls/parameter-time.vue | 3 +- .../config/controls/props-editor-popup.vue | 3 +- .../developer/developer-sidebar.vue | 9 +-- .../components/developer/search-results.vue | 12 ++-- .../web/src/components/expandable-card.vue | 69 +++++++------------ .../web/src/components/home/habot.vue | 3 +- .../web/src/components/home/other-apps.vue | 3 +- .../web/src/components/home/speech-button.vue | 3 +- .../web/src/components/item/group-members.vue | 3 +- .../web/src/components/item/item-form.vue | 9 +-- .../components/item/item-state-preview.vue | 3 +- .../web/src/components/item/item.vue | 3 +- .../item/metadata/item-metadata-alexa.vue | 9 +-- .../metadata/item-metadata-autoupdate.vue | 3 +- .../item/metadata/item-metadata-expire.vue | 6 +- .../item/metadata/item-metadata-ga.vue | 3 +- .../item/metadata/item-metadata-homekit.vue | 6 +- .../item-metadata-itemdescription.vue | 3 +- .../item/metadata/item-metadata-menu.vue | 3 +- .../item/metadata/item-metadata-synonyms.vue | 3 +- .../item/metadata/item-metadata-widget.vue | 3 +- .../metadata/item-metadata-widgetorder.vue | 3 +- .../web/src/components/model/link-details.vue | 3 +- .../components/model/model-picker-popup.vue | 9 +-- .../src/components/model/model-treeview.vue | 3 +- .../src/components/model/treeview-item.vue | 9 +-- .../onboarding/onboarding-cards.vue | 9 +-- .../pagedesigner/chart/chart-designer.vue | 24 +++---- .../components/pagedesigner/page-settings.vue | 3 +- .../pagedesigner/sitemap/mapping-details.vue | 3 +- .../pagedesigner/sitemap/treeview-item.vue | 6 +- .../pagedesigner/sitemap/widget-details.vue | 6 +- .../pagedesigner/widget-config-popup.vue | 3 +- .../pagedesigner/widget-slot-config-popup.vue | 3 +- .../components/rule/action-module-wizard.vue | 24 +++---- .../rule/condition-module-wizard.vue | 21 ++---- .../components/rule/trigger-module-wizard.vue | 45 ++++-------- .../src/components/sitemap/widget-generic.vue | 9 +-- .../web/src/components/tags/tag-input.vue | 3 +- .../src/components/thing/channel-group.vue | 6 +- .../web/src/components/thing/channel-link.vue | 6 +- .../web/src/components/thing/channel-list.vue | 9 +-- .../thing/thing-general-settings.vue | 15 ++-- .../widgets/chart/oh-chart-page.vue | 3 +- .../components/widgets/layout/oh-block.vue | 3 +- .../widgets/layout/oh-grid-item.vue | 3 +- .../widgets/layout/oh-grid-layout.vue | 6 +- .../components/widgets/layout/oh-grid-row.vue | 3 +- .../widgets/layout/oh-layout-page.vue | 6 +- .../widgets/layout/oh-placeholder-widget.vue | 3 +- .../components/widgets/map/oh-map-marker.vue | 3 +- .../components/widgets/map/oh-map-page.vue | 6 +- .../widgets/plan/oh-plan-marker.vue | 6 +- .../components/widgets/plan/oh-plan-page.vue | 9 +-- .../widgets/standard/cell/oh-cell.vue | 3 +- .../widgets/standard/list/oh-list-item.vue | 9 +-- .../widgets/system/oh-chart-component.vue | 6 +- .../widgets/system/oh-colorpicker.vue | 3 +- .../src/components/widgets/system/oh-icon.vue | 3 +- .../components/widgets/system/oh-stepper.vue | 3 +- .../components/widgets/system/oh-video.vue | 3 +- .../src/pages/developer/developer-tools.vue | 3 +- .../pages/developer/widgets/widget-edit.vue | 3 +- .../pages/developer/widgets/widget-list.vue | 15 ++-- .../web/src/pages/home/model-tab.vue | 9 +-- .../org.openhab.ui/web/src/pages/profile.vue | 6 +- .../src/pages/settings/addons/addons-add.vue | 12 ++-- .../src/pages/settings/addons/addons-list.vue | 9 +-- .../pages/settings/addons/binding-config.vue | 3 +- .../src/pages/settings/items/item-details.vue | 6 +- .../pages/settings/items/items-list-vlist.vue | 15 ++-- .../src/pages/settings/items/items-list.vue | 15 ++-- .../pages/settings/model/add-from-thing.vue | 6 +- .../web/src/pages/settings/model/model.vue | 6 +- .../pages/settings/pages/chart/chart-edit.vue | 3 +- .../pages/settings/pages/home/home-edit.vue | 9 +-- .../settings/pages/layout/layout-edit.vue | 6 +- .../src/pages/settings/pages/map/map-edit.vue | 6 +- .../src/pages/settings/pages/pages-list.vue | 18 ++--- .../pages/settings/pages/plan/plan-edit.vue | 6 +- .../pages/settings/pages/tabs/tabs-edit.vue | 3 +- .../settings/rules/rule-configure-module.vue | 12 ++-- .../src/pages/settings/rules/rule-edit.vue | 27 +++----- .../settings/rules/rule-module-popup.vue | 18 ++--- .../src/pages/settings/rules/rules-list.vue | 18 ++--- .../settings/rules/script/script-edit.vue | 12 ++-- .../rules/script/script-general-settings.vue | 9 +-- .../src/pages/settings/schedule/schedule.vue | 6 +- .../settings/services/service-settings.vue | 3 +- .../web/src/pages/settings/settings-menu.vue | 39 ++++------- .../settings/things/add/choose-binding.vue | 9 +-- .../settings/things/add/choose-thing-type.vue | 12 ++-- .../pages/settings/things/add/thing-add.vue | 3 +- .../settings/things/channel/channel-add.vue | 12 ++-- .../settings/things/channel/channel-edit.vue | 6 +- .../settings/things/inbox/inbox-list.vue | 17 ++--- .../pages/settings/things/link/link-add.vue | 15 ++-- .../pages/settings/things/link/link-edit.vue | 9 +-- .../pages/settings/things/thing-details.vue | 12 ++-- .../src/pages/settings/things/things-list.vue | 15 ++-- .../web/src/pages/wizards/setup-wizard.vue | 30 +++----- 117 files changed, 338 insertions(+), 674 deletions(-) diff --git a/bundles/org.openhab.ui/web/.eslintrc.js b/bundles/org.openhab.ui/web/.eslintrc.js index 507ecea6bd..d8ee6f16e5 100644 --- a/bundles/org.openhab.ui/web/.eslintrc.js +++ b/bundles/org.openhab.ui/web/.eslintrc.js @@ -68,7 +68,7 @@ module.exports = { 'vue/attribute-hyphenation': 'off', 'vue/attributes-order': 'off', 'vue/component-definition-name-casing': 'off', - 'vue/html-closing-bracket-newline': 'error', + 'vue/html-closing-bracket-newline': ['error', { 'singleline': 'never', 'multiline': 'never' }], 'vue/html-closing-bracket-spacing': 'error', 'vue/html-indent': 'error', 'vue/html-quotes': 'error', diff --git a/bundles/org.openhab.ui/web/src/components/app.vue b/bundles/org.openhab.ui/web/src/components/app.vue index 1c39664e30..5569dcf7f2 100644 --- a/bundles/org.openhab.ui/web/src/components/app.vue +++ b/bundles/org.openhab.ui/web/src/components/app.vue @@ -26,73 +26,61 @@ + :title="page.config.label" view=".view-main" panel-close> + :class="{ currentsection: currentUrl === '/settings/' || currentUrl.indexOf('/settings/addons/') >= 0 || currentUrl.indexOf('/settings/services/') >= 0 }">
  • + :class="{ currentsection: currentUrl.indexOf('/developer/') >= 0 && currentUrl.indexOf('/developer/widgets') < 0 && currentUrl.indexOf('/developer/api-explorer') < 0 }">
  • @@ -101,8 +89,7 @@ + :class="{ currentsection: currentUrl.indexOf('/about') >= 0 }"> @@ -119,8 +106,7 @@ + :class="{ currentsection: currentUrl.indexOf('/profile') >= 0 }"> diff --git a/bundles/org.openhab.ui/web/src/components/cards/location-card.vue b/bundles/org.openhab.ui/web/src/components/cards/location-card.vue index 2f03bc69fd..430f57bc24 100644 --- a/bundles/org.openhab.ui/web/src/components/cards/location-card.vue +++ b/bundles/org.openhab.ui/web/src/components/cards/location-card.vue @@ -10,15 +10,13 @@
    + :store="context.store" :element="element" :type="badgeType" :invert-color="config.invertText" />
    + :store="context.store" :element="element" :type="badgeType" :invert-color="config.invertText" />
    diff --git a/bundles/org.openhab.ui/web/src/components/cards/model-card.vue b/bundles/org.openhab.ui/web/src/components/cards/model-card.vue index 857e3543a5..b588cdb29d 100644 --- a/bundles/org.openhab.ui/web/src/components/cards/model-card.vue +++ b/bundles/org.openhab.ui/web/src/components/cards/model-card.vue @@ -23,8 +23,7 @@ card-close color="white" class="card-opened-fade-in card-close-button" - icon-f7="multiply_circle_fill" - /> + icon-f7="multiply_circle_fill" />
    diff --git a/bundles/org.openhab.ui/web/src/components/config/config-parameter.vue b/bundles/org.openhab.ui/web/src/components/config/config-parameter.vue index db02b6e03c..48beb96e0c 100644 --- a/bundles/org.openhab.ui/web/src/components/config/config-parameter.vue +++ b/bundles/org.openhab.ui/web/src/components/config/config-parameter.vue @@ -1,7 +1,6 @@ diff --git a/bundles/org.openhab.ui/web/src/components/config/controls/parameter-options.vue b/bundles/org.openhab.ui/web/src/components/config/controls/parameter-options.vue index 7f367460d4..d7fb0d24a2 100644 --- a/bundles/org.openhab.ui/web/src/components/config/controls/parameter-options.vue +++ b/bundles/org.openhab.ui/web/src/components/config/controls/parameter-options.vue @@ -1,8 +1,7 @@ diff --git a/bundles/org.openhab.ui/web/src/components/config/controls/parameter-pagewidget.vue b/bundles/org.openhab.ui/web/src/components/config/controls/parameter-pagewidget.vue index 90a6aa0f27..e783796232 100644 --- a/bundles/org.openhab.ui/web/src/components/config/controls/parameter-pagewidget.vue +++ b/bundles/org.openhab.ui/web/src/components/config/controls/parameter-pagewidget.vue @@ -1,8 +1,7 @@