From c99a7fe916389664d63e711c6b33715e21e3a03b Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 5 Dec 2020 12:50:09 +0900 Subject: [PATCH] Use vuedraggable instead of vue-draggable-next Fix #6852 --- locales/ja-JP.yml | 2 +- package.json | 2 +- src/client/components/post-form-attaches.vue | 34 +++++++++++------ src/client/components/post-form.vue | 16 ++++++-- .../pages/page-editor/page-editor.blocks.vue | 20 +++++++--- .../page-editor/page-editor.container.vue | 1 + src/client/pages/page-editor/page-editor.vue | 27 ++++++------- src/client/pages/settings/reaction.vue | 27 ++++++++----- src/client/store.ts | 13 +++++-- src/client/ui/deck.vue | 8 ++-- src/client/ui/deck/widgets-column.vue | 38 +++++++++++-------- src/client/ui/default.widgets.vue | 36 +++++++++--------- yarn.lock | 16 ++++---- 13 files changed, 148 insertions(+), 92 deletions(-) diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 57af29389..ee94c53da 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -95,7 +95,7 @@ sensitive: "閲覧注意" add: "追加" reaction: "リアクション" reactionSettingDescription: "リアクションピッカーに表示するリアクションを設定します。" -reactionSettingDescription2: "ドラッグして並び替えます。クリックして削除します。" +reactionSettingDescription2: "ドラッグして並び替え、クリックして削除、+を押して追加します。" rememberNoteVisibility: "公開範囲を記憶する" attachCancel: "添付取り消し" markAsSensitive: "閲覧注意にする" diff --git a/package.json b/package.json index 3e0a3d0cd..e38334920 100644 --- a/package.json +++ b/package.json @@ -242,13 +242,13 @@ "vanilla-tilt": "1.7.0", "vue": "3.0.3", "vue-color": "2.7.1", - "vue-draggable-next": "1.0.8", "vue-i18n": "9.0.0-beta.7", "vue-json-pretty": "1.7.1", "vue-loader": "16.0.0", "vue-prism-editor": "2.0.0-alpha.2", "vue-router": "4.0.0-rc.6", "vue-style-loader": "4.1.2", + "vuedraggable": "4.0.1", "vuex": "4.0.0-rc.2", "vuex-persistedstate": "3.1.0", "web-push": "3.4.4", diff --git a/src/client/components/post-form-attaches.vue b/src/client/components/post-form-attaches.vue index 6f3d1bca6..4a14112b1 100644 --- a/src/client/components/post-form-attaches.vue +++ b/src/client/components/post-form-attaches.vue @@ -1,12 +1,14 @@