From a71fc67b9c6aaf9a42b10127050d9016dbbcdb4d Mon Sep 17 00:00:00 2001 From: Devlin Junker Date: Sun, 2 Oct 2022 19:22:10 -0700 Subject: fix editor config and spaces inside of quotes Signed-off-by: Devlin Junker --- .editorconfig | 7 ++++++- src/components/AddFeed.vue | 33 +++++++++++++++------------------ 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.editorconfig b/.editorconfig index df73b20ac..bac177253 100644 --- a/.editorconfig +++ b/.editorconfig @@ -5,11 +5,16 @@ trim_trailing_whitespace = true end_of_line = lf insert_final_newline = true -[*.{js,php,html,vue}] +[*.{php,html}] indent_style = space indent_size = 4 charset = utf-8 +[*.{js,ts,vue}] +indent_style = tab +indent_size = 4 +charset = utf-8 + [*.bats] indent_style = space indent_size = 2 diff --git a/src/components/AddFeed.vue b/src/components/AddFeed.vue index 9eded0159..3688d583c 100644 --- a/src/components/AddFeed.vue +++ b/src/components/AddFeed.vue @@ -9,9 +9,9 @@ :value="feed" ng-model="Navigation.feed.url" ng-class="{'ng-invalid': - !Navigation.addingFeed && - Navigation.feedUrlExists(Navigation.feed.url) - }" + !Navigation.addingFeed && + Navigation.feedUrlExists(Navigation.feed.url) + }" :placeholder="t('news', 'Web address')" name="address" pattern="[^\s]+" @@ -20,7 +20,7 @@

+ Navigation.feedUrlExists(Navigation.feed.url)"> {{ t("news", "Feed exists already!") }}

@@ -40,13 +40,11 @@ type="text" ng-model="Navigation.feed.newFolder" ng-class="{'ng-invalid': - !Navigation.addingFeed && - !Navigation.addingFeed && - Navigation.showNewFolder && - Navigation.folderNameExists( - Navigation.feed.newFolder - ) - }" + !Navigation.addingFeed && + !Navigation.addingFeed && + Navigation.showNewFolder && + Navigation.folderNameExists(Navigation.feed.newFolder) + }" :placeholder="t('news', 'Folder name')" name="folderName" style="width: 90%" @@ -54,7 +52,7 @@

+ Navigation.folderNameExists(Navigation.feed.newFolder)"> {{ t("news", "Folder exists already!") }}

@@ -92,12 +90,11 @@ -- cgit v1.2.3