From 928fedaad7302b8ab58649c88c0e59a357227d38 Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Mon, 7 Aug 2017 22:14:32 +0300
Subject: [PATCH] code-editor: minor refactor

---
 .../components/code_editor/code_editor.ts     | 23 ++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/public/app/core/components/code_editor/code_editor.ts b/public/app/core/components/code_editor/code_editor.ts
index 45c2cafd275..d536c48b044 100644
--- a/public/app/core/components/code_editor/code_editor.ts
+++ b/public/app/core/components/code_editor/code_editor.ts
@@ -1,6 +1,5 @@
 ///<reference path="../../../headers/common.d.ts" />
 
-// import angular from 'angular';
 import coreModule from 'app/core/core_module';
 import ace from 'ace';
 
@@ -16,30 +15,33 @@ function fixModuleUrl(moduleType, name) {
   ace.config.setModuleUrl(aceModeName, ACE_SRC_BASE + componentName);
 }
 
-fixModuleUrl("theme", "solarized_dark");
 fixModuleUrl("ext", "language_tools");
 
 let editorTemplate = `<div></div>`;
 
 function link(scope, elem, attrs) {
+  // Options
+  let langMode = attrs.mode || 'text';
+  let theme = "solarized_dark";
+
   let aceElem = elem.get(0);
   let codeEditor = ace.edit(aceElem);
   let editorSession = codeEditor.getSession();
 
-  codeEditor.setTheme("ace/theme/solarized_dark");
   codeEditor.setHighlightActiveLine(false);
   codeEditor.setShowPrintMargin(false);
   // disable depreacation warning
   codeEditor.$blockScrolling = Infinity;
-  setLangMode();
+  codeEditor.setAutoScrollEditorIntoView(true);
+  setThemeMode(theme);
+  setLangMode(langMode);
 
   codeEditor.setValue(scope.content);
   codeEditor.clearSelection();
 
   elem.addClass("gf-code-editor");
   let textarea = elem.find("textarea");
-  textarea.addClass('gf-form-input width-25');
-  textarea.attr("rows", "4");
+  textarea.addClass('gf-form-input');
 
   editorSession.on('change', (e) => {
     scope.$apply(() => {
@@ -48,8 +50,7 @@ function link(scope, elem, attrs) {
     });
   });
 
-  function setLangMode() {
-    let lang = attrs.mode || 'text';
+  function setLangMode(lang) {
     let aceModeName = `ace/mode/${lang}`;
     fixModuleUrl("mode", lang);
     fixModuleUrl("snippets", lang);
@@ -62,6 +63,12 @@ function link(scope, elem, attrs) {
       });
     });
   }
+
+  function setThemeMode(theme) {
+    fixModuleUrl("theme", theme);
+    let aceThemeName = `ace/theme/${theme}`;
+    codeEditor.setTheme(aceThemeName);
+  }
 }
 
 export function codeEditorDirective() {