From 6768e7bf8ef1bd156ea275e821b424af3d4d715b Mon Sep 17 00:00:00 2001 From: Andrew Leedham Date: Tue, 21 Feb 2017 11:35:27 +0000 Subject: [PATCH 1/3] Add sub pattern styleguide exclusion --- core/lib/ui_builder.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/core/lib/ui_builder.js b/core/lib/ui_builder.js index 22e4357fd..7099ad842 100644 --- a/core/lib/ui_builder.js +++ b/core/lib/ui_builder.js @@ -484,7 +484,7 @@ var ui_builder = function () { _.forEach(styleguidePatterns.patternGroups, function (patternTypeObj, patternType) { var p; - var typePatterns = []; + var typePatterns = [], styleGuidePatterns = []; var styleGuideExcludes = patternlab.config.styleGuideExcludes; _.forOwn(patternTypeObj, function (patternSubtypes, patternSubtype) { @@ -508,6 +508,19 @@ var ui_builder = function () { return pat.isDocPattern; }); + //determine if we should omit this subpatterntype completely from the viewall page + var omitPatternType = styleGuideExcludes && styleGuideExcludes.length + && _.some(styleGuideExcludes, function (exclude) { + return exclude === patternType + '/' + patternSubtype; + }); + if (omitPatternType) { + if (patternlab.config.debug) { + console.log('Omitting ' + patternType + '/' + patternSubtype + ' from building a viewall page because its patternGroup is specified in styleguideExcludes.'); + } + } else { + styleguidePatterns = styleguidePatterns.concat(subtypePatterns); + } + typePatterns = typePatterns.concat(subtypePatterns); var viewAllHTML = buildViewAllHTML(patternlab, subtypePatterns, patternPartial); @@ -544,7 +557,7 @@ var ui_builder = function () { console.log('Omitting ' + patternType + ' from building a viewall page because its patternGroup is specified in styleguideExcludes.'); } } else { - patterns = patterns.concat(typePatterns); + patterns = patterns.concat(styleguidePatterns); } }); return patterns; From 5166a0db3b960aca28c929725c2c4c8364f89246 Mon Sep 17 00:00:00 2001 From: Andrew Leedham Date: Tue, 21 Feb 2017 11:53:48 +0000 Subject: [PATCH 2/3] Change variable conflict name --- core/lib/ui_builder.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/lib/ui_builder.js b/core/lib/ui_builder.js index 7099ad842..76bab9c15 100644 --- a/core/lib/ui_builder.js +++ b/core/lib/ui_builder.js @@ -484,7 +484,7 @@ var ui_builder = function () { _.forEach(styleguidePatterns.patternGroups, function (patternTypeObj, patternType) { var p; - var typePatterns = [], styleGuidePatterns = []; + var typePatterns = [], styleguideTypePatterns = []; var styleGuideExcludes = patternlab.config.styleGuideExcludes; _.forOwn(patternTypeObj, function (patternSubtypes, patternSubtype) { @@ -518,7 +518,7 @@ var ui_builder = function () { console.log('Omitting ' + patternType + '/' + patternSubtype + ' from building a viewall page because its patternGroup is specified in styleguideExcludes.'); } } else { - styleguidePatterns = styleguidePatterns.concat(subtypePatterns); + styleguideTypePatterns = styleguideTypePatterns.concat(subtypePatterns); } typePatterns = typePatterns.concat(subtypePatterns); @@ -557,7 +557,7 @@ var ui_builder = function () { console.log('Omitting ' + patternType + ' from building a viewall page because its patternGroup is specified in styleguideExcludes.'); } } else { - patterns = patterns.concat(styleguidePatterns); + patterns = patterns.concat(styleguideTypePatterns); } }); return patterns; From 6c2da1e5661a4140382458d19cd307f86250b89c Mon Sep 17 00:00:00 2001 From: Andrew Leedham Date: Tue, 21 Feb 2017 14:48:20 +0000 Subject: [PATCH 3/3] Update debug message Changed 'patternGroup' to 'patternSubGroup' --- core/lib/ui_builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/lib/ui_builder.js b/core/lib/ui_builder.js index 76bab9c15..d12b19146 100644 --- a/core/lib/ui_builder.js +++ b/core/lib/ui_builder.js @@ -515,7 +515,7 @@ var ui_builder = function () { }); if (omitPatternType) { if (patternlab.config.debug) { - console.log('Omitting ' + patternType + '/' + patternSubtype + ' from building a viewall page because its patternGroup is specified in styleguideExcludes.'); + console.log('Omitting ' + patternType + '/' + patternSubtype + ' from building a viewall page because its patternSubGroup is specified in styleguideExcludes.'); } } else { styleguideTypePatterns = styleguideTypePatterns.concat(subtypePatterns);