CLI options have priority

This commit is contained in:
Ionică Bizău 2015-09-21 20:59:18 +03:00
parent 94b9e10777
commit 1f23081476

View file

@ -130,7 +130,7 @@ if (authorsOpt.is_provided) {
if (!authorsOpt.is_provided || globalActivityOpt.is_provided) { if (!authorsOpt.is_provided || globalActivityOpt.is_provided) {
options.firstDay = firstDayOpt.value; options.firstDay = firstDayOpt.value;
// This can be a string or an object // This can be a string or an object
if (/^object|string$/.test(Typpy(GitStats.config.theme))) { if (/^object|string$/.test(Typpy(GitStats.config.theme)) && !noAnsiOpt.is_provided && !lightOpt.is_provided) {
options.theme = GitStats.config.theme; options.theme = GitStats.config.theme;
if (typeof GitStats.config.theme === "string") { if (typeof GitStats.config.theme === "string") {
if (!/^DARK|LIGHT$/.test(options.theme)) { if (!/^DARK|LIGHT$/.test(options.theme)) {