Merge 943d2419ca139905116ffd3ddb3d41f5ecf97803 into 6858a9ad67483025f6a9432a926beb9327037be3

package.json

@@ -34,7 +34,7 @@
     "screenfull": "4.2.0",
     "script-loader": "0.7.2",
     "sortablejs": "1.8.4",
-    "tui-editor": "1.3.3",
+    "@toast-ui/editor": "3.1.3",
     "vue": "2.6.10",
     "vue-count-to": "1.0.13",
     "vue-router": "3.0.2",

src/components/MarkdownEditor/default-options.js

@@ -7,25 +7,31 @@ export default {
   usageStatistics: false,
   hideModeSwitch: false,
   toolbarItems: [
+    [
       'heading',
       'bold',
       'italic',
-    'strike',
+      'strike'
-    'divider',
+    ],
+    [
       'hr',
-    'quote',
+      'quote'
-    'divider',
+    ],
+    [
       'ul',
       'ol',
       'task',
-    'indent',
+      'indent'
+    ],
+    [
       'outdent',
-    'divider',
       'table',
       'image',
-    'link',
+      'link'
-    'divider',
+    ],
+    [
       'code',
       'codeblock'
     ]
+  ]
 }

src/components/MarkdownEditor/index.vue

@@ -5,10 +5,9 @@
 <script>
 // deps for editor
 import 'codemirror/lib/codemirror.css' // codemirror
-import 'tui-editor/dist/tui-editor.css' // editor ui
+import '@toast-ui/editor/dist/toastui-editor.css' // Editor's Style
-import 'tui-editor/dist/tui-editor-contents.css' // editor content
 
-import Editor from 'tui-editor'
+import Editor from '@toast-ui/editor'
 import defaultOptions from './default-options'
 
 export default {
@@ -62,8 +61,8 @@ export default {
   },
   watch: {
     value(newValue, preValue) {
-      if (newValue !== preValue && newValue !== this.editor.getValue()) {
+      if (newValue !== preValue && newValue !== this.editor.getMarkdown()) {
-        this.editor.setValue(newValue)
+        this.editor.setMarkdown(newValue)
       }
     },
     language(val) {
@@ -85,27 +84,29 @@ export default {
   },
   methods: {
     initEditor() {
+      console.log(this.editorOptions)
       this.editor = new Editor({
         el: document.getElementById(this.id),
         ...this.editorOptions
       })
       if (this.value) {
-        this.editor.setValue(this.value)
+        this.editor.setMarkdown(this.value)
       }
       this.editor.on('change', () => {
-        this.$emit('input', this.editor.getValue())
+        this.$emit('input', this.editor.getMarkdown())
       })
+      this.editor.getMarkdown()
     },
     destroyEditor() {
       if (!this.editor) return
       this.editor.off('change')
-      this.editor.remove()
+      this.editor.destroy()
     },
     setValue(value) {
-      this.editor.setValue(value)
+      this.editor.setMarkdown(value)
     },
     getValue() {
-      return this.editor.getValue()
+      return this.editor.getMarkdown()
     },
     setHtml(value) {
       this.editor.setHtml(value)

src/views/components-demo/markdown.vue

@@ -20,14 +20,19 @@
       <el-tag class="tag-title">
         Markdown Mode:
       </el-tag>
-      <markdown-editor ref="markdownEditor" v-model="content2" :options="{hideModeSwitch:true,previewStyle:'tab'}" height="200px" />
+      <markdown-editor
+        ref="markdownEditor"
+        v-model="content2"
+        :options="{ hideModeSwitch: true, previewStyle: 'tab' }"
+        height="200px"
+      />
     </div>
 
     <div class="editor-container">
       <el-tag class="tag-title">
         Customize Toolbar:
       </el-tag>
-      <markdown-editor v-model="content3" :options="{ toolbarItems: ['heading','bold','italic']}" />
+      <markdown-editor v-model="content3" :options="{ toolbarItems: [['heading', 'bold', 'italic']] }" />
     </div>
 
     <div class="editor-container">
@@ -92,10 +97,11 @@ export default {
 </script>
 
 <style scoped>
-.editor-container{
+.editor-container {
   margin-bottom: 30px;
 }
-.tag-title{
+
+.tag-title {
   margin-bottom: 5px;
 }
 </style>