public/Boostnote
1
0
Fork 0
mirror of https://github.com/BoostIo/Boostnote synced 2025-12-13 09:46:22 +00:00
Code Issues Releases Wiki Activity

extract normalizeEditorFonrFamily

Browse Source
This commit is contained in:
Sosuke Suzuki
2018-06-27 19:48:09 +09:00
parent 58354061d8
commit 8f4c92e251
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
browser/components/CodeEditor.js
View File

@@ -11,10 +11,10 @@ import crypto from 'crypto'
import consts from 'browser/lib/consts' import consts from 'browser/lib/consts'
import fs from 'fs' import fs from 'fs'
const { ipcRenderer } = require('electron') const { ipcRenderer } = require('electron')
import normalizeEditorFontFamily from 'browser/lib/normalizeEditorFontFamily'
CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js' CodeMirror.modeURL = '../node_modules/codemirror/mode/%N/%N.js'
const defaultEditorFontFamily = consts.DEFAULT_EDITOR_FONT_FAMILY
const buildCMRulers = (rulers, enableRulers) => const buildCMRulers = (rulers, enableRulers) =>
enableRulers ? rulers.map(ruler => ({column: ruler})) : [] enableRulers ? rulers.map(ruler => ({column: ruler})) : []
@@ -495,10 +495,7 @@ export default class CodeEditor extends React.Component {
render () { render () {
const {className, fontSize} = this.props const {className, fontSize} = this.props
let fontFamily = this.props.fontFamily const fontFamily = normalizeEditorFontFamily(this.props.fontFamily)
fontFamily = _.isString(fontFamily) && fontFamily.length > 0
? [fontFamily].concat(defaultEditorFontFamily)
: defaultEditorFontFamily
const width = this.props.width const width = this.props.width
return ( return (
<div <div

9
browser/lib/normalizeEditorFontFamily.js Normal file
View File

@@ -0,0 +1,9 @@
import consts from 'browser/lib/consts'
import isString from 'lodash/isString'
export default function normalizeEditorFontFamily (fontFamily) {
const defaultEditorFontFamily = consts.DEFAULT_EDITOR_FONT_FAMILY
return isString(fontFamily) && fontFamily.length > 0
? [fontFamily].concat(defaultEditorFontFamily)
: defaultEditorFontFamily
}

8
browser/main/modals/PreferencesModal/UiTab.js
View File

@@ -11,14 +11,13 @@ import 'codemirror-mode-elixir'
import _ from 'lodash' import _ from 'lodash'
import i18n from 'browser/lib/i18n' import i18n from 'browser/lib/i18n'
import { getLanguages } from 'browser/lib/Languages' import { getLanguages } from 'browser/lib/Languages'
import normalizeEditorFontFamily from 'browser/lib/normalizeEditorFontFamily'
const OSX = global.process.platform === 'darwin' const OSX = global.process.platform === 'darwin'
const electron = require('electron') const electron = require('electron')
const ipc = electron.ipcRenderer const ipc = electron.ipcRenderer
const defaultEditorFontFamily = consts.DEFAULT_EDITOR_FONT_FAMILY
class UiTab extends React.Component { class UiTab extends React.Component {
constructor (props) { constructor (props) {
super(props) super(props)
@@ -167,10 +166,7 @@ class UiTab extends React.Component {
const codemirrorSampleCode = 'function iamHappy (happy) {\n\tif (happy) {\n\t console.log("I am Happy!")\n\t} else {\n\t console.log("I am not Happy!")\n\t}\n};' const codemirrorSampleCode = 'function iamHappy (happy) {\n\tif (happy) {\n\t console.log("I am Happy!")\n\t} else {\n\t console.log("I am not Happy!")\n\t}\n};'
const enableEditRulersStyle = config.editor.enableRulers ? 'block' : 'none' const enableEditRulersStyle = config.editor.enableRulers ? 'block' : 'none'
const customCSS = config.preview.customCSS const customCSS = config.preview.customCSS
let { fontFamily } = config.editor const fontFamily = normalizeEditorFontFamily(config.editor.fontFamily)
fontFamily = _.isString(fontFamily) && fontFamily.length > 0
? [fontFamily].concat(defaultEditorFontFamily)
: defaultEditorFontFamily
return ( return (
<div styleName='root'> <div styleName='root'>
<div styleName='group'> <div styleName='group'>