Skip to content

Commit 9caf5ff

Browse files
Merge pull request #440 from /issues/393-styleguideExcludes
Issues/393 styleguide excludes
2 parents 4668693 + 1cea9c1 commit 9caf5ff

File tree

2 files changed

+14
-27
lines changed

2 files changed

+14
-27
lines changed

core/lib/ui_builder.js

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,6 @@ var ui_builder = function () {
103103
return true;
104104
}
105105

106-
//this pattern is a member of any excluded pattern groups
107-
isOmitted = styleGuideExcludes && styleGuideExcludes.length && _.some(styleGuideExcludes, function (exclude) {
108-
return exclude === pattern.patternGroup; });
109-
if (isOmitted) {
110-
if (patternlab.config.debug) {
111-
console.log('Omitting ' + pattern.patternPartial + ' from styleguide patterns its patternGroup is specified in styleguideExcludes.');
112-
}
113-
return true;
114-
}
115-
116106
//this pattern is contained with a directory prefixed with an underscore (a handy way to hide whole directories from the nav
117107
isOmitted = pattern.relPath.charAt(0) === '_' || pattern.relPath.indexOf('/_') > -1;
118108
if (isOmitted) {
@@ -463,6 +453,7 @@ var ui_builder = function () {
463453

464454
var p;
465455
var typePatterns = [];
456+
var styleGuideExcludes = patternlab.config.styleGuideExcludes;
466457

467458
_.forOwn(patternTypeObj, function (patternSubtypes, patternSubtype) {
468459

@@ -492,7 +483,6 @@ var ui_builder = function () {
492483
return true; //stop yelling at us eslint we know we know
493484
});
494485

495-
496486
//do not create a viewall page for flat patterns
497487
if (!writeViewAllFile || !p) {
498488
return false;
@@ -509,7 +499,19 @@ var ui_builder = function () {
509499
var viewAllHTML = buildViewAllHTML(patternlab, typePatterns, patternType);
510500
writeFile(paths.public.patterns + p.subdir + '/index.html', mainPageHeadHtml + viewAllHTML + footerHTML);
511501

512-
patterns = patterns.concat(typePatterns);
502+
//determine if we should omit this patterntype completely from the viewall page
503+
var omitPatternType = styleGuideExcludes && styleGuideExcludes.length
504+
&& _.some(styleGuideExcludes, function (exclude) {
505+
return exclude === patternType;
506+
});
507+
if (omitPatternType) {
508+
if (patternlab.config.debug) {
509+
console.log('Omitting ' + patternType+ ' from building a viewall page because its patternGroup is specified in styleguideExcludes.');
510+
}
511+
} else {
512+
patterns = patterns.concat(typePatterns);
513+
}
514+
513515
return true; //stop yelling at us eslint we know we know
514516
});
515517
return patterns;

test/ui_builder_tests.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,6 @@ exports['ui_builder'] = {
5353
test.done();
5454
},
5555

56-
'isPatternExcluded - returns true when patterngroup is specified in styleguideExcludes': function (test) {
57-
//arrange
58-
var patternlab = createFakePatternLab({});
59-
var pattern = new Pattern('00-test/foo.mustache');
60-
patternlab.config.defaultPattern = 'test-boaz';
61-
patternlab.config.styleGuideExcludes.push('test');
62-
63-
//act
64-
var result = ui.isPatternExcluded(pattern, patternlab);
65-
66-
//assert
67-
test.equals(result, true);
68-
test.done();
69-
},
70-
7156
'isPatternExcluded - returns true when pattern within underscored directory - top level': function (test) {
7257
//arrange
7358
var patternlab = createFakePatternLab({});

0 commit comments

Comments
 (0)