diff --git a/demo/demo.html b/demo/demo.html index 5975498e59..fd684f5edf 100644 --- a/demo/demo.html +++ b/demo/demo.html @@ -36,20 +36,18 @@
diff --git a/src/js/editor.js b/src/js/editor.js index 1ed64380bf..6fc37981ab 100644 --- a/src/js/editor.js +++ b/src/js/editor.js @@ -67,6 +67,13 @@ import wwTask from './wysiwygCommands/task'; import wwCode from './wysiwygCommands/code'; import wwCodeBlock from './wysiwygCommands/codeBlock'; +// langs +import './langs/en_US'; +import './langs/ko_KR'; +import './langs/zh_CN'; +import './langs/ja_JP'; +import './langs/nl_NL'; + const __nedInstance = []; /** @@ -165,6 +172,8 @@ class ToastUIEditor { this.eventManager.emit('load', this); __nedInstance.push(this); + + this._addDefaultCommands(); } /** @@ -187,6 +196,53 @@ class ToastUIEditor { this.commandManager.exec(...args); } + /** + * add default commands + * @memberof ToastUIEditor + * @private + */ + _addDefaultCommands() { + this.addCommand(mdBold); + this.addCommand(mdItalic); + this.addCommand(mdBlockquote); + this.addCommand(mdHeading); + this.addCommand(mdParagraph); + this.addCommand(mdHR); + this.addCommand(mdAddLink); + this.addCommand(mdAddImage); + this.addCommand(mdUL); + this.addCommand(mdOL); + this.addCommand(mdTable); + this.addCommand(mdTask); + this.addCommand(mdCode); + this.addCommand(mdCodeBlock); + this.addCommand(mdStrike); + + this.addCommand(wwBold); + this.addCommand(wwItalic); + this.addCommand(wwBlockquote); + this.addCommand(wwUL); + this.addCommand(wwOL); + this.addCommand(wwAddImage); + this.addCommand(wwAddLink); + this.addCommand(wwHR); + this.addCommand(wwHeading); + this.addCommand(wwParagraph); + this.addCommand(wwIncreaseDepth); + this.addCommand(wwDecreaseDepth); + this.addCommand(wwTask); + this.addCommand(wwTable); + this.addCommand(wwTableAddRow); + this.addCommand(wwTableAddCol); + this.addCommand(wwTableRemoveRow); + this.addCommand(wwTableRemoveCol); + this.addCommand(wwTableAlignCol); + this.addCommand(wwTableRemove); + this.addCommand(wwCode); + this.addCommand(wwCodeBlock); + this.addCommand(wwStrike); + } + addCommand(type, props) { if (!props) { this.commandManager.addCommand(type); @@ -685,46 +741,6 @@ class ToastUIEditor { tuiEditor = new ViewOnly(options); } else { tuiEditor = new ToastUIEditor(options); - - tuiEditor.addCommand(mdBold); - tuiEditor.addCommand(mdItalic); - tuiEditor.addCommand(mdBlockquote); - tuiEditor.addCommand(mdHeading); - tuiEditor.addCommand(mdParagraph); - tuiEditor.addCommand(mdHR); - tuiEditor.addCommand(mdAddLink); - tuiEditor.addCommand(mdAddImage); - tuiEditor.addCommand(mdUL); - tuiEditor.addCommand(mdOL); - tuiEditor.addCommand(mdTable); - tuiEditor.addCommand(mdTask); - tuiEditor.addCommand(mdCode); - tuiEditor.addCommand(mdCodeBlock); - tuiEditor.addCommand(mdStrike); - - tuiEditor.addCommand(wwBold); - tuiEditor.addCommand(wwItalic); - tuiEditor.addCommand(wwBlockquote); - tuiEditor.addCommand(wwUL); - tuiEditor.addCommand(wwOL); - tuiEditor.addCommand(wwAddImage); - tuiEditor.addCommand(wwAddLink); - tuiEditor.addCommand(wwHR); - tuiEditor.addCommand(wwHeading); - tuiEditor.addCommand(wwParagraph); - tuiEditor.addCommand(wwIncreaseDepth); - tuiEditor.addCommand(wwDecreaseDepth); - tuiEditor.addCommand(wwTask); - tuiEditor.addCommand(wwTable); - tuiEditor.addCommand(wwTableAddRow); - tuiEditor.addCommand(wwTableAddCol); - tuiEditor.addCommand(wwTableRemoveRow); - tuiEditor.addCommand(wwTableRemoveCol); - tuiEditor.addCommand(wwTableAlignCol); - tuiEditor.addCommand(wwTableRemove); - tuiEditor.addCommand(wwCode); - tuiEditor.addCommand(wwCodeBlock); - tuiEditor.addCommand(wwStrike); } return tuiEditor; diff --git a/src/js/index.js b/src/js/index.js index 216366efe8..df536ffabf 100644 --- a/src/js/index.js +++ b/src/js/index.js @@ -6,13 +6,6 @@ import $ from 'jquery'; import ToastUIEditor from './editor'; -// langs -import './langs/en_US'; -import './langs/ko_KR'; -import './langs/zh_CN'; -import './langs/ja_JP'; -import './langs/nl_NL'; - // for jquery $.fn.tuiEditor = function(...args) { let options, instance; diff --git a/src/js/langs/en_US.js b/src/js/langs/en_US.js index efa818d365..55aa39086e 100644 --- a/src/js/langs/en_US.js +++ b/src/js/langs/en_US.js @@ -1,6 +1,6 @@ -import Editor from '../editor'; +import i18n from '../i18n'; -Editor.i18n.setLanguage(['en', 'en_US'], { +i18n.setLanguage(['en', 'en_US'], { 'Markdown': 'Markdown', 'WYSIWYG': 'WYSIWYG', 'Write': 'Write', diff --git a/src/js/langs/ja_JP.js b/src/js/langs/ja_JP.js index e98aaa3c5e..a1d64628b8 100644 --- a/src/js/langs/ja_JP.js +++ b/src/js/langs/ja_JP.js @@ -1,6 +1,6 @@ -import Editor from '../editor'; +import i18n from '../i18n'; -Editor.i18n.setLanguage(['ja', 'ja_JP'], { +i18n.setLanguage(['ja', 'ja_JP'], { 'Markdown': 'マークダウン', 'WYSIWYG': 'WYSIWYG', 'Write': '編集する', diff --git a/src/js/langs/ko_KR.js b/src/js/langs/ko_KR.js index 36e3b24766..3484bc8249 100644 --- a/src/js/langs/ko_KR.js +++ b/src/js/langs/ko_KR.js @@ -1,6 +1,6 @@ -import Editor from '../editor'; +import i18n from '../i18n'; -Editor.i18n.setLanguage(['ko', 'ko_KR'], { +i18n.setLanguage(['ko', 'ko_KR'], { 'Markdown': '마크다운', 'WYSIWYG': '위지윅', 'Write': '편집하기', diff --git a/src/js/langs/nl_NL.js b/src/js/langs/nl_NL.js index 4544dd935f..08909742fd 100644 --- a/src/js/langs/nl_NL.js +++ b/src/js/langs/nl_NL.js @@ -1,6 +1,6 @@ -import Editor from '../editor'; +import i18n from '../i18n'; -Editor.i18n.setLanguage(['nl', 'nl_NL'], { +i18n.setLanguage(['nl', 'nl_NL'], { 'Markdown': 'Markdown', 'WYSIWYG': 'WYSIWYG', 'Write': 'Write', diff --git a/src/js/langs/zh_CN.js b/src/js/langs/zh_CN.js index 29342a7db1..61c7263792 100644 --- a/src/js/langs/zh_CN.js +++ b/src/js/langs/zh_CN.js @@ -1,6 +1,6 @@ -import Editor from '../editor'; +import i18n from '../i18n'; -Editor.i18n.setLanguage(['zh', 'zh_CN'], { +i18n.setLanguage(['zh', 'zh_CN'], { 'Markdown': 'Markdown', 'WYSIWYG': '所见即所得', 'Write': '编辑',