diff options
author | Max <max@nextcloud.com> | 2022-03-01 13:37:29 +0300 |
---|---|---|
committer | Max <max@nextcloud.com> | 2022-03-01 13:37:38 +0300 |
commit | 0b6f03d037ccf253a615b4689f473d7a094a210f (patch) | |
tree | 777ddc81eb45d7143b4baac5661cd60ad52167e0 /src | |
parent | b373923fddca95a8823311ccac1790307125352b (diff) |
lint: fix errors from @nextcloud/eslint-config@7
* Autofix `vue/first-attribute-linebreak`.
* Explicitely import `Store` from `vuex`.
* Allow importing default with the same name as named for tiptap extensions.
This is the way used in tiptap documentation:
`import Document from '@tiptap/extension-document'`
Disable `import/no-named-as-default` - but only for the lines in question.
Signed-off-by: Max <max@nextcloud.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/EditorFactory.js | 4 | ||||
-rw-r--r-- | src/components/HelpModal.vue | 3 | ||||
-rw-r--r-- | src/components/MenuBar.vue | 9 | ||||
-rw-r--r-- | src/components/MenuBubble.vue | 9 | ||||
-rw-r--r-- | src/components/SessionList.vue | 6 | ||||
-rw-r--r-- | src/extensions/Emoji.js | 1 | ||||
-rw-r--r-- | src/nodes/ImageView.vue | 3 | ||||
-rw-r--r-- | src/store.js | 4 |
8 files changed, 17 insertions, 22 deletions
diff --git a/src/EditorFactory.js b/src/EditorFactory.js index 4e9bb9cd8..af4ff61f1 100644 --- a/src/EditorFactory.js +++ b/src/EditorFactory.js @@ -19,6 +19,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + +/* eslint-disable import/no-named-as-default */ import Document from '@tiptap/extension-document' import Paragraph from '@tiptap/extension-paragraph' import Text from '@tiptap/extension-text' @@ -29,6 +31,8 @@ import OrderedList from '@tiptap/extension-ordered-list' import CodeBlock from '@tiptap/extension-code-block' import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight' import HorizontalRule from '@tiptap/extension-horizontal-rule' +/* eslint-enable import/no-named-as-default */ + import { Editor } from '@tiptap/core' import { Strong, Italic, Strike, Link, Underline } from './marks' import { diff --git a/src/components/HelpModal.vue b/src/components/HelpModal.vue index 590dccaab..a6b04324d 100644 --- a/src/components/HelpModal.vue +++ b/src/components/HelpModal.vue @@ -1,6 +1,5 @@ <template> - <Modal - size="large" + <Modal size="large" :title="t('text', 'Formatting help')" @close="$emit('close')"> <h2>{{ t('text', 'Formatting help') }}</h2> diff --git a/src/components/MenuBar.vue b/src/components/MenuBar.vue index 597a73a99..74f1bd27d 100644 --- a/src/components/MenuBar.vue +++ b/src/components/MenuBar.vue @@ -22,8 +22,7 @@ <template> <div class="menubar" :class="{ 'show': isVisible, 'autohide': autohide }"> - <input - ref="imageFileInput" + <input ref="imageFileInput" type="file" accept="image/*" aria-hidden="true" @@ -53,8 +52,7 @@ :title="icon.label" :aria-label="icon.label" :aria-haspopup="true" /> - <ActionButton - icon="icon-upload" + <ActionButton icon="icon-upload" :close-after-click="true" :disabled="uploadingImage" @click="onUploadImage()"> @@ -103,8 +101,7 @@ </div> </template> </template> - <Actions - @open="toggleChildMenu({ label: 'Remaining Actions' })" + <Actions @open="toggleChildMenu({ label: 'Remaining Actions' })" @close="toggleChildMenu({ label: 'Remaining Actions' })"> <template v-for="(icon, $index) in allIcons"> <ActionButton v-if="icon.class && isHiddenInMenu($index) && !(icon.class === 'icon-emoji')" diff --git a/src/components/MenuBubble.vue b/src/components/MenuBubble.vue index 8c068a045..d63fc9c41 100644 --- a/src/components/MenuBubble.vue +++ b/src/components/MenuBubble.vue @@ -21,8 +21,7 @@ --> <template> - <BubbleMenu - :editor="editor" + <BubbleMenu :editor="editor" :tippy-options="{ onHide: hideLinkMenu, duration: 200, placement: 'bottom' }" class="menububble"> <form v-if="linkMenuIsActive" class="menububble__form" @submit.prevent="setLinkUrl()"> @@ -39,8 +38,7 @@ </form> <template v-else> - <button - class="menububble__button" + <button class="menububble__button" :class="{ 'is-active': isActive('link') }" @click="showLinkMenu()"> <span class="icon-link" /> @@ -55,8 +53,7 @@ <span class="icon-file" /> <span class="menububble__buttontext">{{ t('text', 'Link file') }}</span> </button> - <button - v-if="isActive('link')" + <button v-if="isActive('link')" class="menububble__button" :class="{ 'is-active': isActive('link') }" @click="removeLinkUrl()"> diff --git a/src/components/SessionList.vue b/src/components/SessionList.vue index e953d9581..57eb8a57d 100644 --- a/src/components/SessionList.vue +++ b/src/components/SessionList.vue @@ -30,8 +30,7 @@ :key="session.id" class="avatar-wrapper" :style="sessionStyle(session)"> - <Avatar - :style="avatarStyle(session)" + <Avatar :style="avatarStyle(session)" :user="session.userId ? session.userId : session.guestName" :is-guest="session.userId === null" :disable-menu="true" @@ -49,8 +48,7 @@ :style="avatarStyle(session)"> <div class="avatar-wrapper" :style="sessionStyle(session)"> - <Avatar - :user="session.userId ? session.userId : session.guestName" + <Avatar :user="session.userId ? session.userId : session.guestName" :is-guest="session.userId === null" :disable-menu="true" :show-user-status="false" diff --git a/src/extensions/Emoji.js b/src/extensions/Emoji.js index fa060ef68..c56586300 100644 --- a/src/extensions/Emoji.js +++ b/src/extensions/Emoji.js @@ -22,6 +22,7 @@ import { Node } from '@tiptap/core' import { PluginKey } from 'prosemirror-state' +// eslint-disable-next-line import/no-named-as-default import Suggestion from '@tiptap/suggestion' export const EmojiPluginKey = new PluginKey('emoji') diff --git a/src/nodes/ImageView.vue b/src/nodes/ImageView.vue index 8b480f2ff..ddbf75bcb 100644 --- a/src/nodes/ImageView.vue +++ b/src/nodes/ImageView.vue @@ -41,8 +41,7 @@ type="text" :value="alt" @keyup.enter="updateAlt()"> - <div - v-if="showIcons" + <div v-if="showIcons" class="trash-icon" title="Delete this image" @click="deleteNode"> diff --git a/src/store.js b/src/store.js index 46d24be27..96616c4e2 100644 --- a/src/store.js +++ b/src/store.js @@ -21,14 +21,14 @@ */ import Vue from 'vue' -import Vuex from 'vuex' +import Vuex, { Store } from 'vuex' import { getBuilder } from '@nextcloud/browser-storage' const persistentStorage = getBuilder('text').persist().build() Vue.use(Vuex) -const store = new Vuex.Store({ +const store = new Store({ state: { showAuthorAnnotations: persistentStorage.getItem('showAuthorAnnotations') === 'true', currentSession: persistentStorage.getItem('currentSession'), |