Skip to content

Commit f5fe4b4

Browse files
authored
Merge pull request #148 from WoltLab/6.2-CKEditor-Emoji-picker
CKEditor Emoji Picker
2 parents e2f6271 + a9b3963 commit f5fe4b4

File tree

14 files changed

+253
-639
lines changed

14 files changed

+253
-639
lines changed

app.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import {
3131
RemoveFormat,
3232
Table,
3333
Undo,
34+
Emoji,
3435
WoltlabAttachment,
3536
WoltlabAutoLink,
3637
WoltlabAutosave,
@@ -39,7 +40,6 @@ import {
3940
WoltlabCode,
4041
WoltlabCodeBlock,
4142
WoltlabFontSize,
42-
WoltlabEmoji,
4343
WoltlabHtmlEmbed,
4444
WoltlabImage,
4545
WoltlabMagicParagraph,
@@ -62,6 +62,7 @@ const defaultConfig: Core.EditorConfig = {
6262
Paragraph.Paragraph,
6363
PasteFromOffice.PasteFromOffice,
6464
Undo.Undo,
65+
Emoji.Emoji,
6566

6667
// Formatting
6768
Alignment.Alignment,
@@ -118,7 +119,6 @@ const defaultConfig: Core.EditorConfig = {
118119
WoltlabToolbarGroup.WoltlabToolbarGroup,
119120
WoltlabUpload.WoltlabUpload,
120121
WoltlabFontSize.WoltlabFontSize,
121-
WoltlabEmoji.WoltlabEmoji,
122122
],
123123
};
124124

modules.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ export * as Undo from "@ckeditor/ckeditor5-undo";
3333
export * as Upload from "@ckeditor/ckeditor5-upload";
3434
export * as Utils from "@ckeditor/ckeditor5-utils";
3535
export * as Widget from "@ckeditor/ckeditor5-widget";
36+
export * as Emoji from "@ckeditor/ckeditor5-emoji";
3637

3738
export * as WoltlabAttachment from "./plugins/ckeditor5-woltlab-attachment/src";
3839
export * as WoltlabAutoLink from "./plugins/ckeditor5-woltlab-autolink/src";
@@ -41,7 +42,6 @@ export * as WoltlabBbcode from "./plugins/ckeditor5-woltlab-bbcode/src";
4142
export * as WoltlabBlockQuote from "./plugins/ckeditor5-woltlab-block-quote/src";
4243
export * as WoltlabCode from "./plugins/ckeditor5-woltlab-code/src";
4344
export * as WoltlabCodeBlock from "./plugins/ckeditor5-woltlab-code-block/src";
44-
export * as WoltlabEmoji from "./plugins/ckeditor5-woltlab-emoji/src";
4545
export * as WoltlabHtmlEmbed from "./plugins/ckeditor5-woltlab-html-embed/src";
4646
export * as WoltlabImage from "./plugins/ckeditor5-woltlab-image/src";
4747
export * as WoltlabMagicParagraph from "./plugins/ckeditor5-woltlab-magic-paragraph/src";

package-lock.json

Lines changed: 2 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
"@ckeditor/ckeditor5-undo": "^45.0.0",
3333
"@ckeditor/ckeditor5-utils": "^45.0.0",
3434
"@ckeditor/ckeditor5-widget": "^45.0.0",
35-
"emoji-picker-element": "^1.25.0"
35+
"@ckeditor/ckeditor5-emoji": "^45.0.0"
3636
},
3737
"devDependencies": {
3838
"@ckeditor/ckeditor5-dev-translations": "^43.0.1",
@@ -50,4 +50,4 @@
5050
"webpack": "^5.98.0",
5151
"webpack-cli": "^6.0.1"
5252
}
53-
}
53+
}

plugins/ckeditor5-woltlab-emoji/package.json

Lines changed: 0 additions & 6 deletions
This file was deleted.

plugins/ckeditor5-woltlab-emoji/src/index.ts

Lines changed: 0 additions & 8 deletions
This file was deleted.

plugins/ckeditor5-woltlab-emoji/src/ui/woltlabcoreemojipickerview.ts

Lines changed: 0 additions & 39 deletions
This file was deleted.

plugins/ckeditor5-woltlab-emoji/src/woltlabemoji.ts

Lines changed: 0 additions & 76 deletions
This file was deleted.

plugins/ckeditor5-woltlab-emoji/theme/icons/smile.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

plugins/ckeditor5-woltlab-emoji/theme/woltlabemoji.css

Lines changed: 0 additions & 10 deletions
This file was deleted.

0 commit comments

Comments
 (0)