diff options
| author | Devlin Junker <devlin.junker@gmail.com> | 2022-10-02 19:22:10 -0700 |
|---|---|---|
| committer | Benjamin Brahmer <info@b-brahmer.de> | 2022-10-03 12:58:13 +0200 |
| commit | a71fc67b9c6aaf9a42b10127050d9016dbbcdb4d (patch) | |
| tree | 32ddfe5a446f9d4222f436760b2300bb5db1d6cf | |
| parent | 56ffba7c5a904f30579fcd4bab6b9c75b853b0dc (diff) | |
fix editor config and spaces inside of quotes
Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
| -rw-r--r-- | .editorconfig | 7 | ||||
| -rw-r--r-- | 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 @@ <p class="error" ng-show="!Navigation.addingFeed && - Navigation.feedUrlExists(Navigation.feed.url)"> + Navigation.feedUrlExists(Navigation.feed.url)"> {{ t("news", "Feed exists already!") }} </p> @@ -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 @@ <p class="error" ng-show="!Navigation.addingFeed && - Navigation.folderNameExists(Navigation.feed.newFolder)"> + Navigation.folderNameExists(Navigation.feed.newFolder)"> {{ t("news", "Folder exists already!") }} </p> @@ -92,12 +90,11 @@ <Button :wide="true" type="primary" - ng-disabled=" - Navigation.feedUrlExists(Navigation.feed.url) || - ( - Navigation.showNewFolder && - Navigation.folderNameExists(folder.name) - )" + ng-disabled="Navigation.feedUrlExists(Navigation.feed.url) || + ( + Navigation.showNewFolder && + Navigation.folderNameExists(folder.name) + )" @click="addFeed()"> {{ t("news", "Subscribe") }} </Button> |