Skip to content

Commit

Permalink
🎨 code style fix
Browse files Browse the repository at this point in the history
  • Loading branch information
hackape committed Apr 26, 2017
1 parent 2171881 commit da0fddf
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 22 deletions.
6 changes: 3 additions & 3 deletions app/components/Setting/SettingForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class SettingForm extends Component {

updateSettingItemBind = settingItem => {
let update
if (this.props.domainSetting.requireConfirm) {
if (this.props.setting.requireConfirm) {
update = value => settingItem.tempValue = value
} else {
update = value => settingItem.value = value
Expand All @@ -35,9 +35,9 @@ class SettingForm extends Component {
}

render () {
const { domainSetting } = this.props
const { setting } = this.props
return <div>
{domainSetting.items.map(settingItem =>
{setting.items.map(settingItem =>
<FormInputGroup
key={settingItem.key}
settingItem={settingItem}
Expand Down
36 changes: 17 additions & 19 deletions app/components/Setting/index.jsx
Original file line number Diff line number Diff line change
@@ -1,38 +1,36 @@
/* @flow weak */
import React, { Component } from 'react'
import { bindActionCreators } from 'redux'
import React from 'react'
import { inject, observer } from 'mobx-react'
import cx from 'classnames'
import _ from 'lodash'
import ExtensionList from '../Package/extensionList.js'
import ExtensionList from '../Package/extensionList'
import SettingForm from './SettingForm'

const GeneralSettings = ({ content }) => {
const GeneralSetting = ({ content }) => {
return (
<div>
<h2 className='settings-content-header'>General Settings</h2>
<SettingForm domainSetting={content} />
<h2 className='settings-content-header'>General Setting</h2>
<SettingForm setting={content} />
</div>
)
}

const EditorSettings = ({ content }) => (
const EditorSetting = ({ content }) => (
<div>
<h2 className='settings-content-header'>Editor Settings</h2>
<SettingForm domainSetting={content} />
<h2 className='settings-content-header'>Editor Setting</h2>
<SettingForm setting={content} />
</div>
)

const ThemeSettings = ({ content }) => (
const ThemeSetting = ({ content }) => (
<div>
<h2 className='settings-content-header'>Theme Settings</h2>
<SettingForm domainSetting={content} />
<h2 className='settings-content-header'>Theme Setting</h2>
<SettingForm setting={content} />
</div>
)

const ExtensionSettings = () => (
const ExtensionSetting = () => (
<div>
<h2 className='settings-content-header'>Extension Settings</h2>
<h2 className='settings-content-header'>Extension Setting</h2>
<ExtensionList />
</div>
)
Expand All @@ -42,13 +40,13 @@ const DomainSetting = ({ content, domainKey }) => {
switch (domainKey) {
case 'GENERAL':
default:
return <GeneralSettings content={content} />
return <GeneralSetting content={content} />
case 'EDITOR':
return <EditorSettings content={content} />
return <EditorSetting content={content} />
case 'THEME':
return <ThemeSettings content={content} />
return <ThemeSetting content={content} />
case 'EXTENSIONS':
return <ExtensionSettings />
return <ExtensionSetting />
}
}

Expand Down

0 comments on commit da0fddf

Please sign in to comment.