From 0fa41ba9559d8a950809a82e98f11564f059991f Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Fri, 29 Jul 2016 09:29:14 -0700
Subject: [PATCH] Editor padding and environment edit modal fix

---
 app/app.json                                  | 2 +-
 app/components/base/Editor.js                 | 5 +----
 app/components/modals/EnvironmentEditModal.js | 3 ++-
 app/css/components/editor.scss                | 2 +-
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/app.json b/app/app.json
index fb4089f785..401067d780 100644
--- a/app/app.json
+++ b/app/app.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "name": "insomnia",
-  "version": "3.0.13",
+  "version": "3.0.14",
   "productName": "Insomnia",
   "longName": "Insomnia HTTP Client",
   "description": "The best REST API Client",
diff --git a/app/components/base/Editor.js b/app/components/base/Editor.js
index 5d1cbcd8da..3a1f7195d5 100644
--- a/app/components/base/Editor.js
+++ b/app/components/base/Editor.js
@@ -28,8 +28,6 @@ import 'codemirror/addon/display/autorefresh'
 import 'codemirror/addon/search/search'
 import 'codemirror/addon/search/searchcursor'
 
-import 'codemirror/addon/selection/active-line'
-
 import 'codemirror/addon/search/matchesonscrollbar'
 import 'codemirror/addon/search/matchesonscrollbar.css'
 
@@ -56,13 +54,12 @@ const BASE_CODEMIRROR_OPTIONS = {
   tabSize: 4,
   indentUnit: 4,
   indentWithTabs: true,
-  // styleActiveLine: true,
   gutters: [
     'CodeMirror-linenumbers',
     'CodeMirror-foldgutter',
     'CodeMirror-lint-markers'
   ],
-  cursorScrollMargin: 80,
+  cursorScrollMargin: 12, // NOTE: This is px
   extraKeys: {
     "Ctrl-Q": function (cm) {
       cm.foldCode(cm.getCursor());
diff --git a/app/components/modals/EnvironmentEditModal.js b/app/components/modals/EnvironmentEditModal.js
index 29bf1bb112..ec876d1169 100644
--- a/app/components/modals/EnvironmentEditModal.js
+++ b/app/components/modals/EnvironmentEditModal.js
@@ -55,7 +55,7 @@ class EnvironmentEditModal extends ModalComponent {
   }
 
   render () {
-    const {environmentJSON} = this.state;
+    const {environmentJSON, requestGroup} = this.state;
 
     return (
       <Modal ref="modal" top={true} {...this.props}>
@@ -63,6 +63,7 @@ class EnvironmentEditModal extends ModalComponent {
         <ModalBody>
           <div className="pad-bottom">
             <Editor
+              key={requestGroup ? requestGroup._id : 'n/a'}
               onChange={this._handleChange.bind(this)}
               value={environmentJSON}
               lightTheme={true}
diff --git a/app/css/components/editor.scss b/app/css/components/editor.scss
index 3a1918fbde..30fd734265 100644
--- a/app/css/components/editor.scss
+++ b/app/css/components/editor.scss
@@ -35,7 +35,7 @@
 
   .CodeMirror-lines {
     // Scroll past the end
-    //padding-bottom: 50px;
+    padding-bottom: 50px;
   }
 
   .CodeMirror-placeholder {