Skip to content
This repository was archived by the owner on Dec 14, 2023. It is now read-only.

Commit 2d8c5c2

Browse files
WardormeurArayB
authored andcommitted
Move away from CKEditor for Trix
CKEditor v4 is dodgy for Vue, and CKE5 is GPL, incompatible with our MIT license
1 parent 5aea0ce commit 2d8c5c2

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
"cypress:install": "cypress install"
2121
},
2222
"dependencies": {
23-
"@ckeditor/ckeditor5-build-classic": "^12.1.0",
24-
"@ckeditor/ckeditor5-vue": "^1.0.0-beta.1",
2523
"@coderdojo/cd-common": "1.1.11",
2624
"bootstrap": "^3.4.1",
2725
"cp-translations": "1.0.133",
@@ -45,6 +43,7 @@
4543
"vue-router": "^2.5.3",
4644
"vue-router-multiguard": "^1.0.3",
4745
"vue-static-map": "^2.0.0",
46+
"vue-trix": "^0.8.1",
4847
"vue2-google-maps": "^0.7.9",
4948
"vuex": "^2.3.1"
5049
},

src/events/cd-event-form.vue

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<i class="fa fa-pencil" @click="descriptionIsVisible = true" v-show="!descriptionIsVisible"></i>
2323
<i class="fa fa-times" @click="descriptionIsVisible = false" v-show="descriptionIsVisible"></i>
2424
<div v-if="descriptionIsVisible">
25-
<ckeditor :editor="editor" v-model="description"></ckeditor>
25+
<VueTrix v-model="description" />
2626
</div>
2727
</div>
2828
<div class="cd-event-form__date form-group">
@@ -67,20 +67,19 @@
6767
</template>
6868
<script>
6969
import moment from 'moment';
70+
import VueTrix from 'vue-trix';
7071
import DojoService from '@/dojos/service';
7172
import Dropdown from '@/common/cd-dropdown';
72-
import CKEditor from '@ckeditor/ckeditor5-vue';
73-
import ClassicEditor from '@ckeditor/ckeditor5-build-classic';
7473
import EventTile from './cd-event-tile';
7574
import FormTickets from './form/form-tickets';
7675
7776
export default {
7877
name: 'event-form',
7978
mixins: [EventTile],
8079
components: {
81-
ckeditor: CKEditor.component,
8280
dropdown: Dropdown,
8381
formTickets: FormTickets,
82+
VueTrix,
8483
},
8584
data() {
8685
return {
@@ -94,8 +93,6 @@
9493
year: new Date().getFullYear(),
9594
dojo: {},
9695
today: moment.utc(),
97-
//
98-
editor: ClassicEditor,
9996
// state
10097
addressIsVisible: false,
10198
descriptionIsVisible: false,

yarn.lock

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
# yarn lockfile v1
33

44

5-
"@ckeditor/ckeditor5-build-classic@^12.1.0":
6-
version "12.1.0"
7-
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-build-classic/-/ckeditor5-build-classic-12.1.0.tgz#bd8127b8f11ce0a33a3dd8893546bbed5ab5fd30"
8-
integrity sha512-SYT+stYBS8JqxWZNye5x9AlwNmwY7+bp2IKNdZDsolKFF1CjOC18gmIB4isGfINzFgn/ke1H21XDenZYp3IxqA==
9-
10-
"@ckeditor/ckeditor5-vue@^1.0.0-beta.1":
11-
version "1.0.0-beta.1"
12-
resolved "https://registry.yarnpkg.com/@ckeditor/ckeditor5-vue/-/ckeditor5-vue-1.0.0-beta.1.tgz#976bf7b00bd5f9d99637bfa8279e35f2e899c334"
13-
integrity sha512-CTNyEdofAfmhVomkft6kYEmbh6yRvZMzkvCC4bHZ8LOBHBY7QWkWXP3gbs19SvimUV7PfnsrsDE093aI0SyXqQ==
14-
155
"@coderdojo/[email protected]":
166
version "1.1.11"
177
resolved "https://registry.yarnpkg.com/@coderdojo/cd-common/-/cd-common-1.1.11.tgz#fb42fa68eff8b47d9843007db013d3f3fb4b1f95"
@@ -8031,6 +8021,11 @@ trim-right@^1.0.1:
80318021
version "1.0.1"
80328022
resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"
80338023

8024+
trix@^1.1.0:
8025+
version "1.1.1"
8026+
resolved "https://registry.yarnpkg.com/trix/-/trix-1.1.1.tgz#ca8a3fab4d23d960a17e88441d601cb22a86f5d5"
8027+
integrity sha512-dNHTcryRK0EmwCyJDOBrG6OznL8HNEVVlecq/xzxLj3M9Eht5DV4yl+eCYX8RKyfrtBcNki+mpKIxESgXaGGZA==
8028+
80348029
tryit@^1.0.1:
80358030
version "1.0.3"
80368031
resolved "https://registry.yarnpkg.com/tryit/-/tryit-1.0.3.tgz#393be730a9446fd1ead6da59a014308f36c289cb"
@@ -8465,6 +8460,13 @@ vue-template-es2015-compiler@^1.2.2:
84658460
version "1.5.3"
84668461
resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz#22787de4e37ebd9339b74223bc467d1adee30545"
84678462

8463+
vue-trix@^0.8.1:
8464+
version "0.8.1"
8465+
resolved "https://registry.yarnpkg.com/vue-trix/-/vue-trix-0.8.1.tgz#196ecc69df380233fc48854985d8490b21cab61b"
8466+
integrity sha512-fkDW6qwCDz8/56X5glzZ1iaxTLrZSiKbxEKANMUAC+Y2xAzIWlIzZ8FE6nTm0atNt+X6EzCBc48JYFE8aqOb3Q==
8467+
dependencies:
8468+
trix "^1.1.0"
8469+
84688470
vue-unit-helper@^1.0.9:
84698471
version "1.0.9"
84708472
resolved "https://registry.yarnpkg.com/vue-unit-helper/-/vue-unit-helper-1.0.9.tgz#05bcbc21cd28a9922e88e4a9aa16bf12e939c3b9"

0 commit comments

Comments
 (0)