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 @@ - +