From 086a9223564dacdfec55ea8c78a2faf13f35e18e Mon Sep 17 00:00:00 2001
From: OldHawk <taobataoma@gmail.com>
Date: Sat, 27 Jan 2018 01:55:30 +0800
Subject: [PATCH] feat(core): add codeMirror module support for server config
 online

---
 bower.json                        |  4 +++-
 config/assets/default.js          | 10 ++++++++--
 config/assets/production.js       | 10 ++++++++--
 modules/core/client/app/config.js |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/bower.json b/bower.json
index 5d48352c..29c89ee0 100644
--- a/bower.json
+++ b/bower.json
@@ -36,7 +36,9 @@
     "ngprogress": "^1.1.3",
     "jquery-awesome-cursor": "^0.3.1",
     "jquery-textcomplete": "^1.8.4",
-    "angular-side-overlay": "^1.1.4"
+    "angular-side-overlay": "^1.1.4",
+    "angular-ui-codemirror": "^0.3.0",
+    "codemirror": "^5.33.0"
   },
   "overrides": {
     "bootstrap": {
diff --git a/config/assets/default.js b/config/assets/default.js
index 75b17917..e5a33d2c 100644
--- a/config/assets/default.js
+++ b/config/assets/default.js
@@ -27,7 +27,9 @@ module.exports = {
         //bootstrap-markdown
         'public/lib/bootstrap-markdown/css/bootstrap-markdown.min.css',
         //ngProgress
-        'public/lib/ngprogress/ngProgress.css'
+        'public/lib/ngprogress/ngProgress.css',
+        //codeMirror
+        'public/lib/codemirror/lib/codemirror.css'
 
         // endbower
       ],
@@ -78,7 +80,11 @@ module.exports = {
         //jquery-awesome-cursor
         'public/lib/jquery-awesome-cursor/dist/jquery.awesome-cursor.js',
         //jquery-textcomplete
-        'public/lib/jquery-textcomplete/dist/jquery.textcomplete.js'
+        'public/lib/jquery-textcomplete/dist/jquery.textcomplete.js',
+        //codeMirror
+        'public/lib/codemirror/lib/codemirror.js',
+        'public/lib/angular-ui-codemirror/ui-codemirror.js',
+        'public/lib/codemirror/mode/javascript/javascript.js'
 
         // endbower
       ],
diff --git a/config/assets/production.js b/config/assets/production.js
index cf25d45d..d5796ffd 100644
--- a/config/assets/production.js
+++ b/config/assets/production.js
@@ -27,7 +27,9 @@ module.exports = {
         //bootstrap-markdown
         'public/lib/bootstrap-markdown/css/bootstrap-markdown.min.css',
         //ngProgress
-        'public/lib/ngprogress/ngProgress.css'
+        'public/lib/ngprogress/ngProgress.css',
+        //codeMirror
+        'public/lib/codemirror/lib/codemirror.css'
 
         // endbower
       ],
@@ -78,7 +80,11 @@ module.exports = {
         //jquery-awesome-cursor
         'public/lib/jquery-awesome-cursor/dist/jquery.awesome-cursor.min.js',
         //jquery-textcomplete
-        'public/lib/jquery-textcomplete/dist/jquery.textcomplete.min.js'
+        'public/lib/jquery-textcomplete/dist/jquery.textcomplete.min.js',
+        //codeMirror
+        'public/lib/codemirror/lib/codemirror.js',
+        'public/lib/angular-ui-codemirror/ui-codemirror.min.js',
+        'public/lib/codemirror/mode/javascript/javascript.js'
 
         // endbower
       ]
diff --git a/modules/core/client/app/config.js b/modules/core/client/app/config.js
index a4ee9d0d..2b368b51 100644
--- a/modules/core/client/app/config.js
+++ b/modules/core/client/app/config.js
@@ -8,7 +8,7 @@
     applicationModuleName: applicationModuleName,
     applicationModuleVendorDependencies: ['ngResource', 'ngAnimate', 'ngMessages', 'ui.router', 'ui.bootstrap', 'ngFileUpload', 'ui-notification',
       'LocalStorageModule', 'pascalprecht.translate', 'angularMoment', 'ngFileSaver', 'ngSanitize', 'uiCropper', 'hc.marked', 'angular-json-tree',
-      'ngSideOverlay', 'ngProgress'],
+      'ngSideOverlay', 'ngProgress', 'ui.codemirror'],
     registerModule: registerModule
   };