refactor: all dist namespace to tui.Editor (fix #1048)

nhn · Dec 21, 2017 · 80c0696 · 80c0696
1 parent 4772cb9
commit 80c0696
Show file tree

Hide file tree

Showing 27 changed files with 178 additions and 149 deletions.
diff --git a/bower.json b/bower.json
@@ -27,7 +27,7 @@
     "highlightjs": "^9.12.0",
     "jquery": "^2.2.4",
     "markdown-it": "^8.4.0",
-    "toMark": "nhnent/toMark#0.0.18",
+    "toMark": "nhnent/toMark#0.0.19",
     "tui-color-picker": "^2.0.1",
     "squire-rte": "neilj/Squire#306230d0df9b38047cd06204476ddc0582569cfd",
     "plantuml-encoder": "aleung/plantuml-encoder#156729063bfa62da6fa5f577627ebab57ae98c95",

diff --git a/demo/demo-dev.html b/demo/demo-dev.html
@@ -12,11 +12,14 @@
     <script src="../lib/highlightjs/highlight.pack.js"></script>
     <script src="../lib/squire-rte/build/squire-raw.js"></script>
     <script src="../lib/plantuml-encoder/dist/plantuml-encoder.js"></script>
+    <script src="../lib/raphael/raphael.min.js"></script>
+    <script src="../lib/tui-chart/dist/chart.js"></script>
     <link rel="stylesheet" href="../lib/codemirror/lib/codemirror.css">
     <link rel="stylesheet" href="../lib/highlightjs/styles/github.css">
     <link rel="stylesheet" href="../dist/tui-editor.css">
     <link rel="stylesheet" href="../dist/tui-editor-contents.css">
     <link rel="stylesheet" href="../lib/tui-color-picker/dist/tui-color-picker.css">
+    <link rel="stylesheet" href="../lib/tui-chart/dist/chart.css">
     <style type="text/css">
         html, body {
             padding: 0;
@@ -31,16 +34,14 @@
 </head>
 <body>
 <div id="editSection"></div>
-<script src="../dist/tui-editor-Editor.js"></script>
-<script src="../dist/tui-editor-extScrollFollow.js"></script>
-<script src="../dist/tui-editor-extColorSyntax.js"></script>
+<script src="../dist/tui-editor-Editor-all.js"></script>
 <script>
     $('#editSection').tuiEditor({
         previewStyle: 'vertical',
         height: '100%',
         initialEditType: 'wysiwyg',
         useCommandShortcut: true,
-        exts: ['scrollFollow', 'colorSyntax', 'uml']
+        exts: ['scrollFollow', 'colorSyntax', 'uml', 'chart', 'mark', 'table', 'taskCounter']
     });
 </script>
 </body>

diff --git a/package.json b/package.json
@@ -54,7 +54,9 @@
     "test:sl": "cross-env SERVER=saucelabs karma start",
     "test:lh": "cross-env SERVER=localhost karma start",
     "serve": "webpack-dev-server --progress --inline",
-    "build": "cross-env webpack & webpack -p & BUILD_ALL=true webpack & BUILD_ALL=true webpack -p",
+    "build": "npm run build:prod & npm run build:dev",
+    "build:dev": "cross-env BUILD_ALL=true webpack & webpack & BUILD_EXT=true webpack",
+    "build:prod": "cross-env BUILD_ALL=true webpack -p & webpack -p & BUILD_EXT=true webpack -p",
     "note": "tuie --tag=$(git describe --tags)"
   },
   "dependencies": {

diff --git a/src/js/editor.js b/src/js/editor.js
@@ -731,6 +731,12 @@ class ToastUIEditor {
     }
 }
 
+/**
+ * check whther is viewer
+ * @type {boolean}
+ */
+ToastUIEditor.isViewer = false;
+
 /**
  * I18n instance
  * @type {I18n}
@@ -785,4 +791,4 @@ ToastUIEditor.CommandManager = CommandManager;
  */
 ToastUIEditor.markdownitHighlight = Convertor.getMarkdownitHighlightRenderer();
 
-module.exports = ToastUIEditor;
+export default ToastUIEditor;
diff --git a/src/js/extensions/chart/chart.js b/src/js/extensions/chart/chart.js
@@ -25,13 +25,10 @@ import $ from 'jquery';
 import util from 'tui-code-snippet';
 const chart = window.tui.chart;
 
+import Editor from '../editor';
 import csv from './csv';
-import Editor from '../../editor';
-import EditorViewOnly from '../../viewOnly';
 
-const EditorLoaded = Editor || EditorViewOnly;
-const WwCodeBlockManager = EditorLoaded.WwCodeBlockManager;
-const codeBlockManager = EditorLoaded.codeBlockManager;
+const {WwCodeBlockManager, codeBlockManager} = Editor;
 const LANG = 'chart';
 
 // csv configuration
@@ -493,7 +490,7 @@ function chartExtension(editor) {
     }
 }
 
-(Editor || EditorViewOnly).defineExtension('chart', chartExtension);
+Editor.defineExtension('chart', chartExtension);
 
 export {
     parseCode2DataAndOptions,

diff --git a/src/js/extensions/colorSyntax.js b/src/js/extensions/colorSyntax.js
@@ -6,7 +6,6 @@ import $ from 'jquery';
 import ColorPicker from 'tui-color-picker';
 
 import Editor from '../editor';
-import EditorViewOnly from '../viewOnly';
 
 const colorSyntaxRx = /\{color:(.+?)}(.*?)\{color}/g;
 const colorHtmlRx = /<span (?:class="colour" )?style="color:(.+?)"(?: class="colour")?>(.*?)/g;
@@ -291,6 +290,6 @@ function doubleZeroPad(numberStr) {
     return padded.substr(padded.length - 2);
 }
 
-(Editor || EditorViewOnly).defineExtension('colorSyntax', colorSyntaxExtension);
+Editor.defineExtension('colorSyntax', colorSyntaxExtension);
 
 export default colorSyntaxExtension;
diff --git a/src/js/extensions/editor.js b/src/js/extensions/editor.js
@@ -0,0 +1,4 @@
+import Editor from '../editor';
+import EditorViewer from '../viewOnly';
+
+export default Editor || EditorViewer;
diff --git a/src/js/extensions/mark/mark.js b/src/js/extensions/mark/mark.js
@@ -5,9 +5,7 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../../editor';
-import EditorViewOnly from '../../viewOnly';
-
+import Editor from '../editor';
 import MarkerList from './markerList';
 import MarkerManager from './markerManager';
 import WysiwygMarkerHelper from './wysiwygMarkerHelper';
@@ -248,4 +246,4 @@ function markExtension(editor) {
     }
 }
 
-(Editor || EditorViewOnly).defineExtension('mark', markExtension);
+Editor.defineExtension('mark', markExtension);
diff --git a/src/js/extensions/mark/viewOnlyMarkerHelper.js b/src/js/extensions/mark/viewOnlyMarkerHelper.js
@@ -3,11 +3,9 @@
  * @author Sungho Kim(sungho-kim@nhnent.com) FE Development Team/NHN Ent.
  */
 import $ from 'jquery';
-import Editor from '../../editor';
-import EditorViewOnly from '../../viewOnly';
-
-const domUtils = (Editor || EditorViewOnly).domUtils;
+import Editor from '../editor';
 
+const {domUtils} = Editor;
 const FIND_CRLF_RX = /(\n)|(\r\n)|(\r)/g;
 
 /**

diff --git a/src/js/extensions/mark/wysiwygMarkerHelper.js b/src/js/extensions/mark/wysiwygMarkerHelper.js
@@ -3,10 +3,9 @@
  * @author Sungho Kim(sungho-kim@nhnent.com) FE Development Team/NHN Ent.
  */
 import $ from 'jquery';
-import Editor from '../../editor';
-import EditorViewOnly from '../../viewOnly';
+import Editor from '../editor';
 
-const domUtils = (Editor || EditorViewOnly).domUtils;
+const {domUtils} = Editor;
 const FIND_ZWB_RX = /\u200B/g;
 
 /**

diff --git a/src/js/extensions/scrollFollow/scrollFollow.js b/src/js/extensions/scrollFollow/scrollFollow.js
@@ -3,11 +3,11 @@
  * @author Sungho Kim(sungho-kim@nhnent.com) FE Development Team/NHN Ent.
  */
 import $ from 'jquery';
-import Editor from '../../editor';
+import Editor from '../editor';
 import ScrollSync from './scrollSync';
 import SectionManager from './sectionManager';
 
-const Button = Editor.Button;
+const {Button} = Editor;
 
 function scrollFollowExtension(editor) {
     const className = 'tui-scrollfollow';

diff --git a/src/js/extensions/table/langs.js b/src/js/extensions/table/langs.js
@@ -1,7 +1,7 @@
-import Editor from '../../editor';
+import Editor from '../editor';
 
-if (Editor) {
-    const {i18n} = Editor;
+const {i18n} = Editor;
+if (i18n) {
     i18n.setLanguage(['ko', 'ko_KR'], {
         'Merge cells': '셀 병합',
         'Unmerge cells': '셀 병합해제',

diff --git a/src/js/extensions/table/mergeCell.js b/src/js/extensions/table/mergeCell.js
@@ -5,17 +5,16 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../../editor';
+import Editor from '../editor';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';
 
+const {CommandManager} = Editor;
 const BASIC_CELL_CONTENT = util.browser.msie ? '' : '<br>';
 
 let MergeCell;
-
-if (Editor) {
-    const {CommandManager} = Editor;
+if (CommandManager) {
     MergeCell = CommandManager.command('wysiwyg', /** @lends MergeCell */{
         name: 'MergeCells',
         /**

diff --git a/src/js/extensions/table/mergedTableAddCol.js b/src/js/extensions/table/mergedTableAddCol.js
@@ -5,16 +5,15 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../../editor';
+import Editor from '../editor';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';
 
-let AddCol;
-
-if (Editor) {
-    const {CommandManager} = Editor;
+const {CommandManager} = Editor;
 
+let AddCol;
+if (CommandManager) {
     AddCol = CommandManager.command('wysiwyg', /** @lends AddCol */{
         name: 'AddCol',
         /**

diff --git a/src/js/extensions/table/mergedTableAddRow.js b/src/js/extensions/table/mergedTableAddRow.js
@@ -5,16 +5,15 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../../editor';
+import Editor from '../editor';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';
 
-let AddRow;
-
-if (Editor) {
-    const {CommandManager} = Editor;
+const {CommandManager} = Editor;
 
+let AddRow;
+if (CommandManager) {
     AddRow = CommandManager.command('wysiwyg', /** @lends AddRow */{
         name: 'AddRow',
         /**

diff --git a/src/js/extensions/table/mergedTableAlignCol.js b/src/js/extensions/table/mergedTableAlignCol.js
@@ -5,16 +5,15 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../../editor';
+import Editor from '../editor';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';
 
-let AlignCol;
-
-if (Editor) {
-    const {CommandManager} = Editor;
+const {CommandManager} = Editor;
 
+let AlignCol;
+if (CommandManager) {
     AlignCol = CommandManager.command('wysiwyg', /** @lends AlignCol */{
         name: 'AlignCol',
         /**

diff --git a/src/js/extensions/table/mergedTableRemoveCol.js b/src/js/extensions/table/mergedTableRemoveCol.js
@@ -5,16 +5,15 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../../editor';
+import Editor from '../editor';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';
 
-let RemoveCol;
-
-if (Editor) {
-    const {CommandManager} = Editor;
+const {CommandManager} = Editor;
 
+let RemoveCol;
+if (CommandManager) {
     RemoveCol = CommandManager.command('wysiwyg', /** @lends RemoveCol */{
         name: 'RemoveCol',
         /**

diff --git a/src/js/extensions/table/mergedTableRemoveRow.js b/src/js/extensions/table/mergedTableRemoveRow.js
@@ -5,16 +5,15 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../../editor';
+import Editor from '../editor';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';
 
-let RemoveRow;
-
-if (Editor) {
-    const {CommandManager} = Editor;
+const {CommandManager} = Editor;
 
+let RemoveRow;
+if (CommandManager) {
     RemoveRow = CommandManager.command('wysiwyg', /** @lends RemoveRow */{
         name: 'RemoveRow',
         /**

diff --git a/src/js/extensions/table/mergedTableUI.js b/src/js/extensions/table/mergedTableUI.js
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 
-import Editor from '../../editor';
-const i18n = Editor ? Editor.i18n : null;
+import Editor from '../editor';
+const {i18n} = Editor;
 
 /**
  * Change contextmenu content.

diff --git a/src/js/extensions/table/table.js b/src/js/extensions/table/table.js
@@ -4,8 +4,7 @@
  */
 import $ from 'jquery';
 
-import Editor from '../../editor';
-import EditorViewOnly from '../../viewOnly';
+import Editor from '../editor';
 
 import './langs';
 import createMergedTable from './mergedTableCreator';
@@ -139,4 +138,4 @@ function _bindEvents(eventManager) {
     eventManager.listen('addCommandBefore', _snatchWysiwygCommand);
 }
 
-(Editor || EditorViewOnly).defineExtension('table', tableExtension);
+Editor.defineExtension('table', tableExtension);
diff --git a/src/js/extensions/table/unmergeCell.js b/src/js/extensions/table/unmergeCell.js
@@ -5,15 +5,15 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../../editor';
+import Editor from '../editor';
 import dataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 import tableRenderer from './tableRenderer';
 
-let UnmergeCell;
+const {CommandManager} = Editor;
 
-if (Editor) {
-    const {CommandManager} = Editor;
+let UnmergeCell;
+if (CommandManager) {
     UnmergeCell = CommandManager.command('wysiwyg', /** @lends UnmergeCell */{
         name: 'UnmergeCells',
         /**

diff --git a/src/js/extensions/table/wwMergedTableManager.js b/src/js/extensions/table/wwMergedTableManager.js
@@ -5,13 +5,12 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../../editor';
+import Editor from '../editor';
 import tableDataHandler from './tableDataHandler';
 import tableRenderer from './tableRenderer';
 import tableRangeHandler from './tableRangeHandler';
 
-const WwTableManager = Editor ? Editor.WwTableManager : null;
-const i18n = Editor ? Editor.i18n : {};
+const {WwTableManager, i18n} = Editor;
 const PASTE_TABLE_BOOKMARK = 'tui-paste-table-bookmark';
 const PASTE_TABLE_CELL_BOOKMARK = 'tui-paste-table-cell-bookmark';
 

diff --git a/src/js/extensions/table/wwMergedTableSelectionManager.js b/src/js/extensions/table/wwMergedTableSelectionManager.js
@@ -5,11 +5,11 @@
 import $ from 'jquery';
 import util from 'tui-code-snippet';
 
-import Editor from '../../editor';
+import Editor from '../editor';
 import tableDataHandler from './tableDataHandler';
 import tableRangeHandler from './tableRangeHandler';
 
-const WwTableSelectionManager = Editor ? Editor.WwTableSelectionManager : null;
+const {WwTableSelectionManager} = Editor;
 
 const TABLE_CELL_SELECTED_CLASS_NAME = 'te-cell-selected';