Merge branch 'master' into production

nhn · Mar 29, 2019 · b349351 · b349351
2 parents 4f5a3fd + cdbb3bb
commit b349351
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@toast-ui/vue-editor",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "TOAST UI Editor for Vue",
   "main": "dist/toastui-vue-editor.js",
   "files": [

diff --git a/src/Viewer.vue b/src/Viewer.vue
@@ -41,6 +41,7 @@ export default {
 
     this.editor = Editor.factory({
       el: this.$refs.tuiEditorViewer,
+      exts: this.exts,
       events: eventOption,
       initialValue: this.value,
       height: this.height,

diff --git a/stories/editor.stories.js b/stories/editor.stories.js
@@ -1,5 +1,4 @@
 
-import Vue from 'vue';
 import {storiesOf} from '@storybook/vue';
 import {withKnobs} from '@storybook/addon-knobs';
 import {action} from '@storybook/addon-actions';

diff --git a/stories/viewer.stories.js b/stories/viewer.stories.js
@@ -1,5 +1,4 @@
 
-import Vue from 'vue';
 import {storiesOf} from '@storybook/vue';
 import {html} from 'common-tags';
 import * as dummy from './dummyData';
@@ -9,7 +8,6 @@ import 'highlight.js/styles/github.css';
 import 'tui-editor/dist/tui-editor.min.css';
 import 'tui-editor/dist/tui-editor-contents.min.css';
 
-import 'tui-editor/dist/tui-editor-extScrollSync';
 import 'tui-editor/dist/tui-editor-extColorSyntax';
 import 'tui-editor/dist/tui-editor-extUML';
 import 'tui-editor/dist/tui-editor-extChart';
@@ -35,7 +33,6 @@ stories.add('demo', () => ({
           minHeight: 100,
           maxHeight: 300
         },
-        'scrollSync',
         'colorSyntax',
         'uml',
         'mark',
@@ -65,7 +62,6 @@ stories.add('change value prop', () => ({
           minHeight: 100,
           maxHeight: 300
         },
-        'scrollSync',
         'colorSyntax',
         'uml',
         'mark',
@@ -100,7 +96,6 @@ stories.add('invoke method', () => ({
           minHeight: 100,
           maxHeight: 300
         },
-        'scrollSync',
         'colorSyntax',
         'uml',
         'mark',