summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYukai Huang2016-10-09 17:54:51 +0800
committerYukai Huang2016-10-09 17:54:51 +0800
commit3e2905be13551a0cceeb18e72242be891db10db7 (patch)
treed08cedc6f65beafc7b3e8fd1b2ded8d5641c24c7
parent196d546f7e8273b3fdc1bd60c3bf627b2fa1462b (diff)
Revert to customized codemirror
Diffstat (limited to '')
-rw-r--r--package.json1
-rw-r--r--public/js/index.js6
-rw-r--r--public/views/foot.ejs6
-rw-r--r--webpack.config.js1
4 files changed, 4 insertions, 10 deletions
diff --git a/package.json b/package.json
index 5fa71df9..db81d415 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,6 @@
"bootstrap": "^3.3.7",
"chance": "^1.0.4",
"cheerio": "^0.20.0",
- "codemirror": "^5.19.0",
"compression": "^1.6.2",
"connect-session-sequelize": "^3.1.0",
"cookie": "0.3.1",
diff --git a/public/js/index.js b/public/js/index.js
index 0fba0b21..db76b745 100644
--- a/public/js/index.js
+++ b/public/js/index.js
@@ -18,12 +18,6 @@ require('bootstrap/dist/css/bootstrap.css');
require('prismjs/themes/prism.css');
require('highlight.js/styles/github-gist.css');
-/* code mirror plugins */
-require('codemirror/keymap/vim');
-require('codemirror/keymap/emacs');
-require('codemirror/keymap/sublime');
-require('codemirror/addon/display/panel');
-
require('markdown-it');
require('markdown-it-abbr');
require('markdown-it-footnote');
diff --git a/public/views/foot.ejs b/public/views/foot.ejs
index 13805753..0ad10546 100644
--- a/public/views/foot.ejs
+++ b/public/views/foot.ejs
@@ -22,11 +22,13 @@
<script src="<%- url %>/vendor/mermaid/dist/mermaid.min.js" defer></script>
<% } %>
<script src="<%- url %>/vendor/idle.min.js" defer></script>
+<script src="<%- url %>/vendor/lz-string.min.js" defer></script>
+<script src="<%- url %>/vendor/jquery/dist/jquery.min.js" defer></script>
+<!--codemirror-->
<script src="<%- url %>/vendor/codemirror/codemirror.min.js" defer></script>
-<script src="<%- url %>/vendor/codemirror-spell-checker/spell-checker.min.js" defer></script>
<script src="<%- url %>/vendor/inlineAttachment/inline-attachment.js" defer></script>
<script src="<%- url %>/vendor/inlineAttachment/codemirror.inline-attachment.js" defer></script>
-<script src="<%- url %>/vendor/lz-string.min.js" defer></script>
+<script src="<%- url %>/vendor/codemirror-spell-checker/spell-checker.min.js" defer></script>
<script src="<%- url %>/vendor/ot/ot.min.js" defer></script>
<script src="<%- url %>/vendor/xss.min.js" defer></script>
<script src="<%- url %>/build/js/app.js" defer></script>
diff --git a/webpack.config.js b/webpack.config.js
index 9959a1ee..85e3a005 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -12,7 +12,6 @@ module.exports = {
"window.jQuery": "jquery",
Visibility: "visibilityjs",
Cookies: "js-cookie",
- CodeMirror: "codemirror",
emojify: "emojify.js",
io: "socket.io-client",
LZString: "lz-string",