ashatora/editor
1
0
Fork 0
mirror of https://github.com/maputnik/editor.git synced 2025-12-27 08:30:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into feature/add-range-slider

Browse Source
This commit is contained in:
orangemug
2020-01-19 11:06:39 +00:00
parent 2ccd1d227e 6c240d53e4
commit 59e070f463
23 changed files with 340 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/layers/JSONEditor.jsx
View File

@@ -7,6 +7,7 @@ import CodeMirror from 'codemirror';
import 'codemirror/mode/javascript/javascript'
import 'codemirror/addon/lint/lint'
import 'codemirror/addon/edit/matchbrackets'
import 'codemirror/lib/codemirror.css'
import 'codemirror/addon/lint/lint.css'
import '../../codemirror-maputnik.css'
@@ -47,6 +48,7 @@ class JSONEditor extends React.Component {
viewportMargin: Infinity,
lineNumbers: true,
lint: true,
matchBrackets: true,
gutters: ["CodeMirror-lint-markers"],
scrollbarStyle: "null",
});
@@ -105,17 +107,6 @@ class JSONEditor extends React.Component {
}
render() {
const codeMirrorOptions = {
mode: {name: "javascript", json: true},
tabSize: 2,
theme: 'maputnik',
viewportMargin: Infinity,
lineNumbers: true,
lint: true,
gutters: ["CodeMirror-lint-markers"],
scrollbarStyle: "null",
}
const style = {};
if (this.props.maxHeight) {
style.maxHeight = this.props.maxHeight;