From 4772cb954a493a67ea444f1959e813270abfdc2c Mon Sep 17 00:00:00 2001 From: "kyuwoo.choi" Date: Sat, 16 Dec 2017 01:01:57 +0900 Subject: [PATCH] refactor: namespace to es6 import (fix #1024) Squashed commit of the following: commit 9f179e4f0619999b740906abfbee1b8021339ca0 Author: kyuwoo.choi Date: Sat Dec 16 00:59:49 2017 +0900 refactor: demo dep path to bower from npm (fix #1024) commit b13129c10f387cc2382290df38c14cc8639c1192 Author: kyuwoo.choi Date: Fri Dec 15 22:14:09 2017 +0900 style: eslint config commit 88f1862fdfdcb68b5c7b83f1e6c662219d7a7fcb Author: kyuwoo.choi Date: Fri Dec 15 21:27:54 2017 +0900 refactor: namespace to es6 import (fix #1024) commit 652aa682af8d0869d583f8714e8dc2012c0a58fb Author: kyuwoo.choi Date: Fri Dec 15 16:04:46 2017 +0900 refactor: update npm dep & es6 import for packages (fix #1024) commit f9f3d46c67fd31f93539633d7c7b95866da2f719 Author: kyuwoo.choi Date: Fri Dec 15 11:12:23 2017 +0900 refactor: npm dep update & es6 import jquery, colorpicker (fix #1024) commit 6c05b7c208d363155d8133b83cae084d79233724 Author: kyuwoo.choi Date: Thu Dec 14 20:20:06 2017 +0900 fix: broken wepack external conf for serve (fix #1021) commit 1a4f92fb92dc5dc53f91cba508209eb77f5701d9 Author: kyuwoo.choi Date: Thu Dec 14 17:18:11 2017 +0900 chore: update dependencies (fix #1024) --- .eslintrc | 12 +- bower.json | 30 +- demo/demo-chart-viewOnly.html | 4 +- demo/demo-chart.html | 4 +- demo/demo-dev.html | 4 +- demo/demo-marker.html | 4 +- demo/demo-scrollfollow.html | 4 +- demo/demo-table-viewOnly.html | 2 +- demo/demo-table.html | 6 +- demo/demo-textpalette.html | 4 +- demo/demo-uml-viewOnly.html | 4 +- demo/demo-uml.html | 4 +- demo/demo-viewOnlyMarker.html | 4 +- demo/demo.html | 4 +- karma.conf.js | 19 +- package-lock.json | 6953 +++++++++++++---- package.json | 31 +- src/js/codeBlockEditor.js | 2 + src/js/codeBlockManager.js | 3 +- src/js/codeMirrorExt.js | 10 +- src/js/codemirror/arrowKeyFunction.js | 3 +- src/js/codemirror/continuelist.js | 2 +- src/js/codemirror/fixOrderedListNumber.js | 3 +- src/js/codemirror/gfm.js | 3 +- src/js/codemirror/markdown.js | 2 +- src/js/codemirror/overlay.js | 2 +- src/js/command.js | 3 +- src/js/commandManager.js | 4 +- src/js/componentManager.js | 1 - src/js/convertor.js | 11 +- src/js/domUtils.js | 10 +- src/js/editor.js | 4 +- src/js/eventManager.js | 2 +- src/js/extManager.js | 3 +- src/js/extensions/chart/chart.js | 6 +- src/js/extensions/colorSyntax.js | 5 +- src/js/extensions/mark/mark.js | 5 +- .../extensions/mark/markdownMarkerHelper.js | 3 +- src/js/extensions/mark/markerList.js | 3 +- src/js/extensions/mark/markerManager.js | 3 +- .../extensions/mark/viewOnlyMarkerHelper.js | 1 + src/js/extensions/mark/wysiwygMarkerHelper.js | 1 + .../extensions/scrollFollow/scrollFollow.js | 1 + src/js/extensions/scrollFollow/scrollSync.js | 2 +- .../extensions/scrollFollow/sectionManager.js | 1 + src/js/extensions/table/mergeCell.js | 3 +- src/js/extensions/table/mergedTableAddCol.js | 4 +- src/js/extensions/table/mergedTableAddRow.js | 4 +- .../extensions/table/mergedTableAlignCol.js | 4 +- src/js/extensions/table/mergedTableCreator.js | 4 +- .../extensions/table/mergedTableRemoveCol.js | 4 +- .../extensions/table/mergedTableRemoveRow.js | 4 +- src/js/extensions/table/mergedTableUI.js | 2 + src/js/extensions/table/table.js | 2 + src/js/extensions/table/tableDataHandler.js | 6 +- src/js/extensions/table/tableRangeHandler.js | 4 +- src/js/extensions/table/tableRenderer.js | 1 + .../extensions/table/tableUnmergePreparer.js | 1 + src/js/extensions/table/toMarkRenderer.js | 5 +- src/js/extensions/table/unmergeCell.js | 4 +- .../extensions/table/wwMergedTableManager.js | 4 +- .../table/wwMergedTableSelectionManager.js | 4 +- src/js/extensions/taskCounter.js | 1 - src/js/extensions/uml.js | 2 +- src/js/htmlSanitizer.js | 6 +- src/js/i18n.js | 3 +- src/js/importManager.js | 3 +- src/js/index.js | 9 +- src/js/indexViewOnly.js | 1 + src/js/layout.js | 1 + src/js/lazyRunner.js | 3 +- src/js/markdownCommands/heading.js | 2 +- src/js/markdownCommands/paragraph.js | 3 +- src/js/markdownEditor.js | 4 +- .../markdownitTableRenderer.js | 1 - src/js/mdListManager.js | 1 - src/js/mdPreview.js | 1 - src/js/preview.js | 1 + src/js/squireExt.js | 6 +- src/js/ui/blockOverlay.js | 3 +- src/js/ui/button.js | 2 - src/js/ui/codeBlockGadget.js | 2 + src/js/ui/codeBlockLanguagesCombo.js | 1 + src/js/ui/defaultUI.js | 1 + src/js/ui/layerpopup.js | 3 +- src/js/ui/modeSwitch.js | 3 +- src/js/ui/popupAddHeading.js | 4 +- src/js/ui/popupAddImage.js | 3 +- src/js/ui/popupAddLink.js | 2 +- src/js/ui/popupAddTable.js | 3 +- src/js/ui/popupCodeBlockEditor.js | 5 +- src/js/ui/popupCodeBlockLanguages.js | 4 +- src/js/ui/popupTableUtils.js | 4 +- src/js/ui/scrollSyncSplit.js | 3 +- src/js/ui/tab.js | 4 +- src/js/ui/toolbar.js | 7 +- src/js/ui/tooltip.js | 1 + src/js/ui/uicontroller.js | 4 +- src/js/viewOnly.js | 4 +- src/js/wwClipboardManager.js | 9 +- src/js/wwCodeBlockManager.js | 4 +- src/js/wwHeadingManager.js | 1 + src/js/wwHrManager.js | 1 + src/js/wwListManager.js | 1 + src/js/wwPManager.js | 1 + src/js/wwPasteContentHelper.js | 4 +- src/js/wwTableManager.js | 11 +- src/js/wwTableSelectionManager.js | 14 +- src/js/wwTaskManager.js | 1 + src/js/wwTextObject.js | 5 +- src/js/wysiwygCommands/addImage.js | 1 - src/js/wysiwygCommands/addLink.js | 1 + src/js/wysiwygCommands/code.js | 4 +- src/js/wysiwygCommands/codeBlock.js | 4 +- src/js/wysiwygCommands/decreaseDepth.js | 1 + src/js/wysiwygCommands/heading.js | 1 + src/js/wysiwygCommands/hr.js | 1 - src/js/wysiwygCommands/increaseDepth.js | 1 + src/js/wysiwygCommands/paragraph.js | 1 + src/js/wysiwygCommands/table.js | 1 - src/js/wysiwygCommands/tableAddCol.js | 4 +- src/js/wysiwygCommands/tableAddRow.js | 4 +- src/js/wysiwygCommands/tableAlignCol.js | 3 +- src/js/wysiwygCommands/tableRemove.js | 1 + src/js/wysiwygCommands/tableRemoveCol.js | 1 + src/js/wysiwygCommands/tableRemoveRow.js | 1 + src/js/wysiwygCommands/task.js | 1 + src/js/wysiwygCommands/ul.js | 1 - src/js/wysiwygEditor.js | 4 +- test/.eslintrc | 18 + test/codeBlockEditor.spec.js | 2 +- test/codeBlockPreview.spec.js | 3 +- test/codeMirrorExt.spec.js | 8 +- test/codemirror/fixOrderedListNumber.spec.js | 3 +- test/codemirror/markdown.spec.js | 3 +- test/componentManager.spec.js | 2 + test/converting.spec.js | 9 + test/convertor.spec.js | 2 - test/domUtils.spec.js | 2 + test/editor.spec.js | 17 +- test/es6.spec.js | 154 - test/eventManager.spec.js | 8 +- test/excelTableParser.spec.js | 8 +- test/extensions/chart.spec.js | 2 - test/extensions/codeBlockPlantUML.spec.js | 6 +- test/extensions/mark/mark.spec.js | 5 +- .../mark/markdownMarkerHelper.spec.js | 4 +- .../mark/viewOnlyMarkerHelper.spec.js | 2 + .../scrollFollow/scrollFollow.spec.js | 6 +- .../scrollFollow/scrollSync.spec.js | 6 +- .../scrollFollow/sectionManager.spec.js | 6 +- test/extensions/table/mergeCell.spec.js | 2 + .../table/mergedTableAddCol.spec.js | 15 +- .../table/mergedTableAddRow.spec.js | 5 +- .../table/mergedTableCreator.spec.js | 2 + .../table/mergedTableRemoveCol.spec.js | 6 +- .../table/mergedTableRemoveRow.spec.js | 6 +- .../extensions/table/tableDataHandler.spec.js | 2 + .../table/tableRangeHandler.spec.js | 2 + .../table/tableUnmergePreparer.spec.js | 2 + test/extensions/table/toMarkRenderer.spec.js | 2 + test/extensions/table/unmergeCell.spec.js | 5 +- .../table/wwMergedTableManager.spec.js | 5 +- test/htmlSanitizer.spec.js | 2 + test/importManager.spec.js | 6 +- test/integration/clipboard.spec.js | 7 +- test/integration/editor.spec.js | 6 +- test/layout.spec.js | 2 + test/lazyRunner.spec.js | 2 + test/markdonitCustomRenderer.spec.js | 2 + test/markdownCommands/addImage.spec.js | 3 +- test/markdownCommands/addLink.spec.js | 2 + test/markdownCommands/blockquote.spec.js | 2 + test/markdownCommands/bold.spec.js | 2 + test/markdownCommands/code.spec.js | 2 + test/markdownCommands/codeBlock.spec.js | 2 + test/markdownCommands/heading.spec.js | 2 + test/markdownCommands/hr.spec.js | 2 + test/markdownCommands/italic.spec.js | 2 + test/markdownCommands/ol.spec.js | 2 + test/markdownCommands/paragraph.spec.js | 2 + test/markdownCommands/strike.spec.js | 2 + test/markdownCommands/table.spec.js | 2 + test/markdownCommands/task.spec.js | 4 +- test/markdownCommands/ul.spec.js | 2 + test/markdownEditor.spec.js | 3 +- test/mdPreview.spec.js | 3 +- test/mdTextObject.spec.js | 2 + test/preview.spec.js | 3 +- test/squireExt.spec.js | 3 + test/ui/blockOverlay.spec.js | 3 +- test/ui/button.spec.js | 3 +- test/ui/codeBlockGadget.spec.js | 3 +- test/ui/codeBlockLanguagesCombo.spec.js | 5 +- test/ui/layerpopup.spec.js | 2 + test/ui/modeSwitch.spec.js | 1 + test/ui/popupAddHeading.spec.js | 2 + test/ui/popupAddImage.spec.js | 4 +- test/ui/popupAddLink.spec.js | 2 + test/ui/popupAddTable.spec.js | 1 + test/ui/popupCodeBlockEditor.spec.js | 2 +- test/ui/popupCodeBlockLanguages.spec.js | 2 +- test/ui/scrollSyncSplit.spec.js | 4 +- test/ui/tab.spec.js | 2 + test/ui/toolbar.spec.js | 3 +- test/ui/uicontroller.spec.js | 1 + test/viewOnly.spec.js | 7 +- test/wwClipboardManager.spec.js | 2 + test/wwCodeBlockManager.spec.js | 28 +- test/wwHeadingManager.spec.js | 4 +- test/wwHrManager.spec.js | 21 +- test/wwListManager.spec.js | 2 + test/wwPManager.spec.js | 4 +- test/wwPasteContentHelper.spec.js | 14 +- test/wwTableManager.spec.js | 49 +- test/wwTableSelectionManager.spec.js | 2 + test/wwTaskManager.spec.js | 8 +- test/wwTextObject.spec.js | 4 +- test/wysiwygCommands/addLink.spec.js | 2 + test/wysiwygCommands/bold.spec.js | 4 +- test/wysiwygCommands/code.spec.js | 2 + test/wysiwygCommands/codeBlock.spec.js | 2 + test/wysiwygCommands/decreaseDepth.spec.js | 2 + test/wysiwygCommands/heading.spec.js | 4 +- test/wysiwygCommands/hr.spec.js | 4 +- test/wysiwygCommands/increaseDepth.spec.js | 2 + test/wysiwygCommands/italic.spec.js | 4 +- test/wysiwygCommands/ol.spec.js | 2 + test/wysiwygCommands/paragraph.spec.js | 5 +- test/wysiwygCommands/strike.spec.js | 4 +- test/wysiwygCommands/table.spec.js | 4 +- test/wysiwygCommands/tableAddCol.spec.js | 2 + test/wysiwygCommands/tableAddRow.spec.js | 2 + test/wysiwygCommands/tableAlignCol.spec.js | 36 +- test/wysiwygCommands/tableRemove.spec.js | 18 +- test/wysiwygCommands/tableRemoveCol.spec.js | 2 + test/wysiwygCommands/tableRemoveRow.spec.js | 76 +- test/wysiwygCommands/task.spec.js | 2 + test/wysiwygCommands/ul.spec.js | 2 + test/wysiwygEditor.spec.js | 5 +- webpack.config.js | 101 +- 241 files changed, 5998 insertions(+), 2329 deletions(-) create mode 100644 test/.eslintrc delete mode 100644 test/es6.spec.js diff --git a/.eslintrc b/.eslintrc index abad684eba..90ce75282e 100644 --- a/.eslintrc +++ b/.eslintrc @@ -14,17 +14,11 @@ }, "env":{ "es6": true, - "amd": true, - "jasmine": true, - "jquery": true - }, - "globals": { - "tui": true, - "loadFixtures": true, - "ActiveXObject": true + "amd": true }, "rules": { "linebreak-style": 0, - "max-len": [2, {"code": 120, "tabWidth": 4, "ignoreStrings": true, "ignoreComments": true, "ignoreRegExpLiterals": true, "ignoreTemplateLiterals": true}] + "max-len": [2, {"code": 120, "tabWidth": 4, "ignoreStrings": true, "ignoreComments": true, "ignoreRegExpLiterals": true, "ignoreTemplateLiterals": true}], + "no-sync": 0 } } diff --git a/bower.json b/bower.json index 57f0db033e..c6dafdb123 100644 --- a/bower.json +++ b/bower.json @@ -10,12 +10,7 @@ "moduleType": [ "globals" ], - "main": [ - "dist/tui-editor.js", - "dist/tui-editor.min.js", - "dist/tui-editor.css", - "dist/tui-editor-contents.css" - ], + "main": "dist/tui-editor-Editor.js", "license": "MIT", "ignore": [ "**/.*", @@ -27,19 +22,18 @@ ], "keywords": [], "dependencies": { - "tui-code-snippet": "1.2.5", - "codemirror": "^5.25.0", - "highlightjs": "^9.10.0", - "jquery": "~2.1.4", - "markdown-it": "^8.3.1", - "toMark": "https://github.com/nhnent/toMark.git#0.0.18", - "tui-component-colorpicker": "~1.0.2", - "squire-rte": "https://github.com/neilj/Squire.git#306230d0df9b38047cd06204476ddc0582569cfd", - "plantuml-encoder": "https://github.com/aleung/plantuml-encoder.git#156729063bfa62da6fa5f577627ebab57ae98c95", - "tui-chart": "^2.9.4" + "tui-code-snippet": "^1.2.9", + "codemirror": "^5.32.0", + "highlightjs": "^9.12.0", + "jquery": "^2.2.4", + "markdown-it": "^8.4.0", + "toMark": "nhnent/toMark#0.0.18", + "tui-color-picker": "^2.0.1", + "squire-rte": "neilj/Squire#306230d0df9b38047cd06204476ddc0582569cfd", + "plantuml-encoder": "aleung/plantuml-encoder#156729063bfa62da6fa5f577627ebab57ae98c95", + "tui-chart": "v2.12.0" }, "resolutions": { - "jquery": "~2.1.4", - "tui-code-snippet": "1.2.5" + "tui-code-snippet": "^1.2.9" } } diff --git a/demo/demo-chart-viewOnly.html b/demo/demo-chart-viewOnly.html index 47ab27fa3e..b55dce64a9 100644 --- a/demo/demo-chart-viewOnly.html +++ b/demo/demo-chart-viewOnly.html @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ - +