refactor: namespace to es6 import (fix #1024)

Squashed commit of the following: commit 9f179e4f0619999b740906abfbee1b8021339ca0 Author: kyuwoo.choi <kyuwoo.choi@nhnent.com> Date: Sat Dec 16 00:59:49 2017 +0900 refactor: demo dep path to bower from npm (fix #1024) commit b13129c10f387cc2382290df38c14cc8639c1192 Author: kyuwoo.choi <kyuwoo.choi@nhnent.com> Date: Fri Dec 15 22:14:09 2017 +0900 style: eslint config commit 88f1862fdfdcb68b5c7b83f1e6c662219d7a7fcb Author: kyuwoo.choi <kyuwoo.choi@nhnent.com> Date: Fri Dec 15 21:27:54 2017 +0900 refactor: namespace to es6 import (fix #1024) commit 652aa682af8d0869d583f8714e8dc2012c0a58fb Author: kyuwoo.choi <kyuwoo.choi@nhnent.com> Date: Fri Dec 15 16:04:46 2017 +0900 refactor: update npm dep & es6 import for packages (fix #1024) commit f9f3d46c67fd31f93539633d7c7b95866da2f719 Author: kyuwoo.choi <kyuwoo.choi@nhnent.com> Date: Fri Dec 15 11:12:23 2017 +0900 refactor: npm dep update & es6 import jquery, colorpicker (fix #1024) commit 6c05b7c208d363155d8133b83cae084d79233724 Author: kyuwoo.choi <kyuwoo.choi@nhnent.com> Date: Thu Dec 14 20:20:06 2017 +0900 fix: broken wepack external conf for serve (fix #1021) commit 1a4f92fb92dc5dc53f91cba508209eb77f5701d9 Author: kyuwoo.choi <kyuwoo.choi@nhnent.com> Date: Thu Dec 14 17:18:11 2017 +0900 chore: update dependencies (fix #1024)
nhn · Dec 15, 2017 · 4772cb9 · 4772cb9
1 parent 4e2cc53
commit 4772cb9
Show file tree

Hide file tree

Showing 241 changed files with 5,998 additions and 2,329 deletions.
diff --git 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
@@ -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
@@ -7,7 +7,7 @@
     <script src="../lib/toMark/dist/toMark.js"></script>
     <script src="../lib/jquery/dist/jquery.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.js"></script>
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <script src="../lib/highlightjs/highlight.pack.js"></script>
     <script src="../lib/squire-rte/build/squire-raw.js"></script>
@@ -18,7 +18,7 @@
     <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-component-colorpicker/dist/colorpicker.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 {

diff --git a/demo/demo-chart.html b/demo/demo-chart.html
@@ -7,7 +7,7 @@
     <script src="../lib/toMark/dist/toMark.js"></script>
     <script src="../lib/jquery/dist/jquery.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.js"></script>
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <script src="../lib/highlightjs/highlight.pack.js"></script>
     <script src="../lib/squire-rte/build/squire-raw.js"></script>
@@ -18,7 +18,7 @@
     <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-component-colorpicker/dist/colorpicker.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 {

diff --git a/demo/demo-dev.html b/demo/demo-dev.html
@@ -7,7 +7,7 @@
     <script src="../lib/toMark/dist/toMark.js"></script>
     <script src="../lib/jquery/dist/jquery.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.js"></script>
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <script src="../lib/highlightjs/highlight.pack.js"></script>
     <script src="../lib/squire-rte/build/squire-raw.js"></script>
@@ -16,7 +16,7 @@
     <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-component-colorpicker/dist/colorpicker.css">
+    <link rel="stylesheet" href="../lib/tui-color-picker/dist/tui-color-picker.css">
     <style type="text/css">
         html, body {
             padding: 0;

diff --git a/demo/demo-marker.html b/demo/demo-marker.html
@@ -7,15 +7,15 @@
     <script src="../lib/toMark/dist/toMark.js"></script>
     <script src="../lib/jquery/dist/jquery.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.js"></script>
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <script src="../lib/highlightjs/highlight.pack.js"></script>
     <script src="../lib/squire-rte/build/squire-raw.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-component-colorpicker/dist/colorpicker.css">
+    <link rel="stylesheet" href="../lib/tui-color-picker/dist/tui-color-picker.css">
     <style type="text/css">
         html, body {
             padding: 0;

diff --git a/demo/demo-scrollfollow.html b/demo/demo-scrollfollow.html
@@ -7,15 +7,15 @@
     <script src="../lib/toMark/dist/toMark.js"></script>
     <script src="../lib/jquery/dist/jquery.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.js"></script>
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <script src="../lib/highlightjs/highlight.pack.js"></script>
     <script src="../lib/squire-rte/build/squire-raw.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-component-colorpicker/dist/colorpicker.css">
+    <link rel="stylesheet" href="../lib/tui-color-picker/dist/tui-color-picker.css">
     <style type="text/css">
         html, body {
             padding: 0;

diff --git a/demo/demo-table-viewOnly.html b/demo/demo-table-viewOnly.html
@@ -3,7 +3,7 @@
 <head lang="en">
     <meta charset="UTF-8">
     <title>DEMO</title>
-    <script src="../lib/markdown-it/dist/markdown-it.min.js"></script>
+    <script src="../lib/markdown-it/dist/markdown-it.js"></script>
     <script src="../lib/toMark/dist/toMark.min.js"></script>
     <script src="../lib/jquery/dist/jquery.min.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>

diff --git a/demo/demo-table.html b/demo/demo-table.html
@@ -3,19 +3,19 @@
 <head lang="en">
     <meta charset="UTF-8">
     <title>DEMO</title>
-    <script src="../lib/markdown-it/dist/markdown-it.min.js"></script>
+    <script src="../lib/markdown-it/dist/markdown-it.js"></script>
     <script src="../lib/toMark/dist/toMark.min.js"></script>
     <script src="../lib/jquery/dist/jquery.min.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.min.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.min.js"></script>
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <script src="../lib/highlightjs/highlight.pack.min.js"></script>
     <script src="../lib/squire-rte/build/squire.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-component-colorpicker/dist/colorpicker.min.css">
+    <link rel="stylesheet" href="../lib/tui-color-picker/dist/tui-color-picker.min.css">
     <style type="text/css">
         html, body {
             padding: 0;

diff --git a/demo/demo-textpalette.html b/demo/demo-textpalette.html
@@ -7,15 +7,15 @@
     <script src="../lib/toMark/dist/toMark.js"></script>
     <script src="../lib/jquery/dist/jquery.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.js"></script>
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <script src="../lib/highlightjs/highlight.pack.js"></script>
     <script src="../lib/squire-rte/build/squire-raw.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-component-colorpicker/dist/colorpicker.css">
+    <link rel="stylesheet" href="../lib/tui-color-picker/dist/tui-color-picker.css">
     <style type="text/css">
         html, body {
             padding: 0;

diff --git a/demo/demo-uml-viewOnly.html b/demo/demo-uml-viewOnly.html
@@ -7,15 +7,15 @@
     <script src="../lib/toMark/dist/toMark.js"></script>
     <script src="../lib/jquery/dist/jquery.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.js"></script>
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <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.min.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-contents.css">
-    <link rel="stylesheet" href="../lib/tui-component-colorpicker/dist/colorpicker.css">
+    <link rel="stylesheet" href="../lib/tui-color-picker/dist/tui-color-picker.css">
     <style type="text/css">
         html, body {
             padding: 0;

diff --git a/demo/demo-uml.html b/demo/demo-uml.html
@@ -7,7 +7,7 @@
     <script src="../lib/toMark/dist/toMark.js"></script>
     <script src="../lib/jquery/dist/jquery.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.js"></script>
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <script src="../lib/highlightjs/highlight.pack.js"></script>
     <script src="../lib/squire-rte/build/squire-raw.js"></script>
@@ -16,7 +16,7 @@
     <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-component-colorpicker/dist/colorpicker.css">
+    <link rel="stylesheet" href="../lib/tui-color-picker/dist/tui-color-picker.css">
     <style type="text/css">
         html, body {
             padding: 0;

diff --git a/demo/demo-viewOnlyMarker.html b/demo/demo-viewOnlyMarker.html
@@ -7,15 +7,15 @@
     <script src="../lib/toMark/dist/toMark.js"></script>
     <script src="../lib/jquery/dist/jquery.js"></script>
     <script src="../lib/tui-code-snippet/dist/tui-code-snippet.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.js"></script>
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <script src="../lib/highlightjs/highlight.pack.js"></script>
     <script src="../lib/squire-rte/build/squire-raw.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-component-colorpicker/dist/colorpicker.css">
+    <link rel="stylesheet" href="../lib/tui-color-picker/dist/tui-color-picker.css">
     <style type="text/css">
         html, body {
             padding: 0;

diff --git a/demo/demo.html b/demo/demo.html
@@ -10,13 +10,13 @@
     <script src="../lib/codemirror/lib/codemirror.js"></script>
     <script src="../lib/highlightjs/highlight.pack.js"></script>
     <script src="../lib/squire-rte/build/squire-raw.js"></script>
-    <script src="../lib/tui-component-colorpicker/dist/colorpicker.js"></script>
+    <script src="../lib/tui-color-picker/dist/tui-color-picker.js"></script>
     <script src="../dist/tui-editor-Editor.js"></script>
     <script src="../dist/tui-editor-extTable.js"></script>
     <script src="../dist/tui-editor-extColorSyntax.js"></script>
     <link rel="stylesheet" href="../lib/codemirror/lib/codemirror.css">
     <link rel="stylesheet" href="../lib/highlightjs/styles/github.css">
-    <link rel="stylesheet" href="../lib/tui-component-colorpicker/dist/colorpicker.css">
+    <link rel="stylesheet" href="../lib/tui-color-picker/dist/tui-color-picker.css">
     <link rel="stylesheet" href="../dist/tui-editor.css">
     <link rel="stylesheet" href="../dist/tui-editor-contents.css">
     <style type="text/css">

diff --git a/karma.conf.js b/karma.conf.js
@@ -152,20 +152,13 @@ module.exports = function(config) {
         frameworks: ['jasmine-ajax', 'jasmine-jquery', 'jasmine'],
 
         // list of files / patterns to load in the browser
+        // chart is not npm package and it needs global code snippet.
+        // remove chart and code snippet from here once chart is on npm
         files: [
-            'lib/jquery/dist/jquery.js',
-            'lib/tui-code-snippet/dist/tui-code-snippet.js',
-            'lib/tui-component-colorpicker/dist/colorpicker.js',
-            'lib/plantuml-encoder/dist/plantuml-encoder.js',
-            'lib/toMark/dist/toMark.js',
-            'lib/highlightjs/highlight.pack.js',
-            'lib/markdown-it/dist/markdown-it.min.js',
-            'lib/codemirror/lib/codemirror.js',
-            'lib/codemirror/lib/codemirror.css',
-            'lib/codemirror/addon/mode/overlay.js',
-            'lib/codemirror/mode/markdown/markdown.js',
-            'lib/codemirror/mode/gfm/gfm.js',
-            'lib/squire-rte/build/squire-raw.js',
+            'node_modules/tui-code-snippet/dist/tui-code-snippet.js',
+            'node_modules/tui.chart/dist/chart.js',
+            'node_modules/tui.chart/dist/chart.css',
+            'node_modules/codemirror/lib/codemirror.css',
             'src/css/tui-editor.css',
             'test/fixtures/*.*',
             'test/test.bundle.js'