set languge when changed from toolbar

main
briandennis 7 years ago
parent d303751608
commit dd9ba60d70

@ -4,7 +4,7 @@ import domtoimage from 'dom-to-image'
import CodeMirror from 'react-codemirror' import CodeMirror from 'react-codemirror'
import Spinner from 'react-spinner' import Spinner from 'react-spinner'
import WindowControls from '../components/WindowControls' import WindowControls from '../components/WindowControls'
import { COLORS } from '../lib/constants' import { COLORS, DEFAULT_LANGUAGE } from '../lib/constants'
const DEFAULT_SETTINGS = { const DEFAULT_SETTINGS = {
paddingVertical: '50px', paddingVertical: '50px',
@ -13,7 +13,7 @@ const DEFAULT_SETTINGS = {
marginHorizontal: '45px', marginHorizontal: '45px',
background: '#fed0ec', background: '#fed0ec',
theme: 'dracula', theme: 'dracula',
language: 'javascript' language: DEFAULT_LANGUAGE
} }
class Carbon extends React.Component { class Carbon extends React.Component {
@ -23,6 +23,8 @@ class Carbon extends React.Component {
this.state = { this.state = {
loading: true loading: true
} }
this.detectLanguage = this.detectLanguage.bind(this)
} }
componentDidMount() { componentDidMount() {
@ -31,12 +33,23 @@ class Carbon extends React.Component {
}) })
} }
detectLanguage () {
return 'javascript'
}
render () { render () {
const config = Object.assign(DEFAULT_SETTINGS, this.props.config) const config = Object.assign(DEFAULT_SETTINGS, this.props.config)
let language
if (config.language.name === 'Auto') {
language = this.detectLanguage(this.props.children)
} else {
language = config.language.module || 'plaintext'
}
const options = { const options = {
lineNumbers: false, lineNumbers: false,
mode: config.language, mode: language,
theme: config.theme, theme: config.theme,
scrollBarStyle: null, scrollBarStyle: null,
viewportMargin: Infinity, viewportMargin: Infinity,

@ -55,6 +55,10 @@ export const LANGUAGES = [
{ {
name: 'Plain Text' name: 'Plain Text'
}, },
{
name: 'C',
module: 'clike'
},
{ {
name: 'Clojure', name: 'Clojure',
module: 'clojure' module: 'clojure'
@ -229,6 +233,8 @@ export const LANGUAGES = [
} }
] ]
export const DEFAULT_LANGUAGE = { name: 'Auto' }
export const COLORS = { export const COLORS = {
BLACK: '#121212', BLACK: '#121212',
PRIMARY: '#F8E81C', PRIMARY: '#F8E81C',

@ -9,7 +9,7 @@ import ReadFileDropContainer from '../components/ReadFileDropContainer'
import Toolbar from '../components/Toolbar' import Toolbar from '../components/Toolbar'
import Carbon from '../components/Carbon' import Carbon from '../components/Carbon'
import api from '../lib/api' import api from '../lib/api'
import { THEMES, LANGUAGES, COLORS, DEFAULT_CODE } from '../lib/constants' import { THEMES, LANGUAGES, DEFAULT_LANGUAGE, COLORS, DEFAULT_CODE } from '../lib/constants'
class Editor extends React.Component { class Editor extends React.Component {
/* pathname, asPath, err, req, res */ /* pathname, asPath, err, req, res */
@ -30,7 +30,7 @@ class Editor extends React.Component {
this.state = { this.state = {
background: '#ABB8C3', background: '#ABB8C3',
theme: THEMES[0].id, theme: THEMES[0].id,
language: 'javascript', // TODO LANGUAGES[0] language: DEFAULT_LANGUAGE,
dropShadow: true, dropShadow: true,
windowControls: true, windowControls: true,
paddingVertical: '48px', paddingVertical: '48px',

Loading…
Cancel
Save