quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-16 05:38:41 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix color configuration with an array (#2729)

Browse source 
Fixes #2728
This commit is contained in:
CHaBou 2018-03-21 10:00:29 +01:00 committed by GitHub
parent 500c8b0e05
commit dc33d4846b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/config.js
View file

@ -4,6 +4,7 @@ const {_import, getDefaultConfig} = require('./config/import');
const _openConfig = require('./config/open'); const _openConfig = require('./config/open');
const win = require('./config/windows'); const win = require('./config/windows');
const {cfgPath, cfgDir} = require('./config/paths'); const {cfgPath, cfgDir} = require('./config/paths');
const {getColorMap} = require('./utils/colors');
const watchers = []; const watchers = [];
let cfg = {}; let cfg = {};
@ -129,6 +130,7 @@ const checkDeprecatedConfig = function() {
exports.fixConfigDefaults = decoratedConfig => { exports.fixConfigDefaults = decoratedConfig => {
const defaultConfig = getDefaultConfig().config; const defaultConfig = getDefaultConfig().config;
decoratedConfig.colors = getColorMap(decoratedConfig.colors) || {};
// We must have default colors for xterm css. // We must have default colors for xterm css.
decoratedConfig.colors = Object.assign({}, defaultConfig.colors, decoratedConfig.colors); decoratedConfig.colors = Object.assign({}, defaultConfig.colors, decoratedConfig.colors);
return decoratedConfig; return decoratedConfig;

17
lib/utils/colors.js → app/utils/colors.js
View file

@ -19,13 +19,14 @@ const colorList = [
'grayscale' 'grayscale'
]; ];
export default function getColorList(colors) { exports.getColorMap = colors => {
// For backwards compatibility, return early if it's already an array if (!Array.isArray(colors)) {
if (Array.isArray(colors)) {
return colors; return colors;
} }
return colors.reduce((result, color, index) => {
return colorList.map(colorName => { if (index < colorList.length) {
return colors[colorName]; result[colorList[index]] = color;
}); }
} return result;
}, {});
};

9
lib/reducers/ui.js
View file

@ -20,7 +20,6 @@ import {
SESSION_SET_CWD SESSION_SET_CWD
} from '../constants/sessions'; } from '../constants/sessions';
import {UPDATE_AVAILABLE} from '../constants/updater'; import {UPDATE_AVAILABLE} from '../constants/updater';
import {values} from '../utils/object';
const allowedCursorShapes = new Set(['BEAM', 'BLOCK', 'UNDERLINE']); const allowedCursorShapes = new Set(['BEAM', 'BLOCK', 'UNDERLINE']);
const allowedCursorBlinkValues = new Set([true, false]); const allowedCursorBlinkValues = new Set([true, false]);
@ -200,13 +199,7 @@ const reducer = (state = initial, action) => {
} }
if (config.colors) { if (config.colors) {
if (Array.isArray(config.colors)) { if (JSON.stringify(state.colors) !== JSON.stringify(config.colors)) {
const stateColors = Array.isArray(state.colors) ? state.colors : values(state.colors);
if (stateColors.toString() !== config.colors.toString()) {
ret.colors = config.colors;
}
} else if (JSON.stringify(state.colors) !== JSON.stringify(config.colors)) {
ret.colors = config.colors; ret.colors = config.colors;
} }
} }