Skip to content

Commit d7a145c

Browse files
committed
Fix smileys
Fixes #163
1 parent 55a4ff7 commit d7a145c

File tree

1 file changed

+7
-22
lines changed

1 file changed

+7
-22
lines changed

script/plugins/Menu/MenuInitializer.js

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import PageMacroDropdownDispatcher from './MenuItems/PageMacroDropdownDispatcher
3636
import PageMacroMenuItemDispatcher from './MenuItems/PageMacroMenuItemDispatcher';
3737
import UndoMenuItemDispatcher from './MenuItems/UndoMenuItemDispatcher';
3838
import RedoMenuItemDispatcher from './MenuItems/RedoMenuItemDispatcher';
39+
import SmileyConf from '../../custom/SmileyConf';
3940

4041
class MenuInitializer {
4142
constructor(schema) {
@@ -50,6 +51,11 @@ class MenuInitializer {
5051

5152
collectMenuItems() {
5253
const lang = LANG.plugins.prosemirror;
54+
55+
const smileys = SmileyConf.getSmileys();
56+
const smileyItems = Object.keys(smileys)
57+
.map(smiley => new SmileyMenuItemDispatcher(smileys[smiley], smiley));
58+
5359
return [
5460
new MarkDropdownDispatcher([
5561
new MarkMenuItemDispatcher('strong', 'format-bold', lang['label:strong']),
@@ -73,28 +79,7 @@ class MenuInitializer {
7379
BlockquoteMenuItemDispatcher,
7480
FootnoteMenuItemDispatcher,
7581
RSSMenuItemDispatcher,
76-
new SmileyDropdownDispatcher([
77-
new SmileyMenuItemDispatcher('icon_cool.gif', '8-)'),
78-
new SmileyMenuItemDispatcher('icon_eek.gif', '8-O'),
79-
new SmileyMenuItemDispatcher('icon_sad.gif', ':-('),
80-
new SmileyMenuItemDispatcher('icon_smile.gif', ':-)'),
81-
new SmileyMenuItemDispatcher('icon_smile2.gif', '=)'),
82-
new SmileyMenuItemDispatcher('icon_doubt.gif', ':-/'),
83-
new SmileyMenuItemDispatcher('icon_doubt2.gif', ':-\\'),
84-
new SmileyMenuItemDispatcher('icon_confused.gif', ':-?'),
85-
new SmileyMenuItemDispatcher('icon_biggrin.gif', ':-D'),
86-
new SmileyMenuItemDispatcher('icon_razz.gif', ':-P'),
87-
new SmileyMenuItemDispatcher('icon_surprised.gif', ':-O'),
88-
new SmileyMenuItemDispatcher('icon_silenced.gif', ':-X'),
89-
new SmileyMenuItemDispatcher('icon_neutral.gif', ':-|'),
90-
new SmileyMenuItemDispatcher('icon_wink.gif', ';-)'),
91-
new SmileyMenuItemDispatcher('icon_fun.gif', '^_^'),
92-
new SmileyMenuItemDispatcher('icon_question.gif', ':?:'),
93-
new SmileyMenuItemDispatcher('icon_exclaim.gif', ':!:'),
94-
new SmileyMenuItemDispatcher('icon_lol.gif', 'LOL'),
95-
new SmileyMenuItemDispatcher('fixme.gif', 'FIXME'),
96-
new SmileyMenuItemDispatcher('delete.gif', 'DELETEME'),
97-
]),
82+
new SmileyDropdownDispatcher(smileyItems),
9883
new HeadingDropdownDispatcher([
9984
new HeadingMenuItemDispatcher(1),
10085
new HeadingMenuItemDispatcher(2), // eslint-disable-line no-magic-numbers

0 commit comments

Comments
 (0)