From 3e2905be13551a0cceeb18e72242be891db10db7 Mon Sep 17 00:00:00 2001
From: Yukai Huang
Date: Sun, 9 Oct 2016 17:54:51 +0800
Subject: Revert to customized codemirror

---
 package.json          | 1 -
 public/js/index.js    | 6 ------
 public/views/foot.ejs | 6 ++++--
 webpack.config.js     | 1 -
 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",
-- 
cgit v1.2.3