Fixed configured indentation not being applied to Ace editor (see #158)
This commit is contained in:
parent
f1e49c2ad0
commit
3f6f5d2a70
|
@ -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
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
*
|
||||
* @author Jos de Jong, <wjosdejong@gmail.com>
|
||||
* @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;
|
||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue