Fixed configured indentation not being applied to Ace editor (see jos…

…dejong#158)
ImpulseHu · Jan 25, 2015 · 3f6f5d2 · 3f6f5d2
1 parent f1e49c2
commit 3f6f5d2
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -12,6 +12,7 @@ https://github.com/josdejong/jsoneditor
   after that throws the error.
 - Fixed Node.path() not working for a JSON Object `""`. Thanks @tomalec.
 - Minor styling improvements.
+- Fixed configured indentation not being applied to Ace editor.
 
 
 ## 2014-09-03, version 3.1.2

diff --git a/jsoneditor.js b/jsoneditor.js
@@ -24,7 +24,7 @@
  *
  * @author  Jos de Jong, <[email protected]>
  * @version 3.1.3-SNAPSHOT
- * @date    2015-01-23
+ * @date    2015-01-25
  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
@@ -1181,7 +1181,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	      editor.setShowPrintMargin(false);
 	      editor.setFontSize(13);
 	      editor.getSession().setMode('ace/mode/json');
-	      editor.getSession().setTabSize(2);
+	      editor.getSession().setTabSize(this.indentation);
 	      editor.getSession().setUseSoftTabs(true);
 	      editor.getSession().setUseWrapMode(true);
 	      this.editor = editor;

diff --git a/jsoneditor.map b/jsoneditor.map
diff --git a/jsoneditor.min.js b/jsoneditor.min.js
diff --git a/src/js/textmode.js b/src/js/textmode.js
@@ -112,7 +112,7 @@ define(['./modeswitcher', './util'], function (modeswitcher, util) {
       editor.setShowPrintMargin(false);
       editor.setFontSize(13);
       editor.getSession().setMode('ace/mode/json');
-      editor.getSession().setTabSize(2);
+      editor.getSession().setTabSize(this.indentation);
       editor.getSession().setUseSoftTabs(true);
       editor.getSession().setUseWrapMode(true);
       this.editor = editor;