From b97a0ef7a99daad83bb019e6294d174ebb0dd725 Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Wed, 21 Dec 2016 23:24:28 -0800
Subject: [PATCH] No more codemirror ld-json, fixed sidebar footer css
 overflow, added bracket closing

---
 app/ui/components/Toast.js         | 2 +-
 app/ui/components/base/Editor.js   | 8 ++------
 app/ui/css/components/editor.less  | 8 ++++----
 app/ui/css/components/sidebar.less | 3 +++
 package.json                       | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/app/ui/components/Toast.js b/app/ui/components/Toast.js
index fb44ff5339..2ed650b94c 100644
--- a/app/ui/components/Toast.js
+++ b/app/ui/components/Toast.js
@@ -54,7 +54,7 @@ class Toast extends Component {
     // Fade the notification in
     setTimeout(() => this.setState({visible: true}), 1000);
 
-    trackEvent('Notification', 'Shown', notification.key);
+    trackEvent('Notification', 'Shown', notification.key, {nonInteraction: true});
   };
 
   _loadSeen () {
diff --git a/app/ui/components/base/Editor.js b/app/ui/components/base/Editor.js
index 647b7ef562..ecc9978acb 100644
--- a/app/ui/components/base/Editor.js
+++ b/app/ui/components/base/Editor.js
@@ -30,6 +30,7 @@ import 'codemirror/addon/display/autorefresh';
 import 'codemirror/addon/search/search';
 import 'codemirror/addon/search/searchcursor';
 import 'codemirror/addon/edit/matchbrackets';
+import 'codemirror/addon/edit/closebrackets';
 import 'codemirror/addon/search/matchesonscrollbar';
 import 'codemirror/addon/search/matchesonscrollbar.css';
 import 'codemirror/addon/fold/foldgutter';
@@ -56,6 +57,7 @@ const BASE_CODEMIRROR_OPTIONS = {
   lint: true,
   tabSize: 4,
   matchBrackets: true,
+  autoCloseBrackets: true,
   indentUnit: 4,
   indentWithTabs: true,
   gutters: [
@@ -227,12 +229,6 @@ class Editor extends Component {
 
     // Strip of charset if there is one
     options.mode = options.mode ? options.mode.split(';')[0] : 'text/plain';
-
-    if (this._isJSON(options.mode)) {
-      // set LD JSON because it highlights the keys a different color
-      options.mode = {name: 'javascript', jsonld: true}
-    }
-
     Object.keys(options).map(key => {
       this.codeMirror.setOption(key, options[key]);
     });
diff --git a/app/ui/css/components/editor.less b/app/ui/css/components/editor.less
index 145e17d5ea..4b4334dff7 100644
--- a/app/ui/css/components/editor.less
+++ b/app/ui/css/components/editor.less
@@ -190,10 +190,6 @@
     color: lighten(@surprise, 5);
   }
 
-  .cm-s-default span.cm-property, .cm-s-default span.cm-attribute {
-    color: lighten(@success, 5);
-  }
-
   .cm-s-default span.cm-keyword {
     color: #f92672;
   }
@@ -206,6 +202,10 @@
     color: lighten(@notice, 5);
   }
 
+  .cm-s-default span.cm-property, .cm-s-default span.cm-attribute {
+    color: lighten(@success, 5);
+  }
+
   .cm-s-default span.cm-variable {
     color: #f8f8f2;
   }
diff --git a/app/ui/css/components/sidebar.less b/app/ui/css/components/sidebar.less
index 1f52cfb828..bf60e8be4b 100644
--- a/app/ui/css/components/sidebar.less
+++ b/app/ui/css/components/sidebar.less
@@ -354,10 +354,13 @@
   .sidebar__footer {
     height: @line-height-xs;
     border-top: 1px solid @hl-md;
+    width: 100%;
+    overflow: hidden;
   }
 
   .sidebar__footer > button,
   .sidebar__footer .dropdown > button {
+    background: red;
     font-size: @font-size-sm;
     padding: @padding-xs @padding-md;
     height: 100%;
diff --git a/package.json b/package.json
index 1825b14d8d..c5709cf7a5 100644
--- a/package.json
+++ b/package.json
@@ -95,7 +95,7 @@
   "dependencies": {
     "analytics-node": "^2.1.0",
     "classnames": "^2.2.3",
-    "codemirror": "^5.18.2",
+    "codemirror": "^5.22.0",
     "electron-context-menu": "^0.4.0",
     "electron-cookies": "^1.1.0",
     "electron-squirrel-startup": "^1.0.0",