Skip to content

processing-but-hiding-underscore-prefixed-dirs #414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmuenzenmeyer merged 3 commits into from
Aug 14, 2016
Merged

processing-but-hiding-underscore-prefixed-dirs #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4df616a
processing-but-hiding-underscore-prefixed-dirs
e2tha-e Jul 29, 2016
6e07b8c
comment update
e2tha-e Aug 2, 2016
f9a8747
comment update
e2tha-e Aug 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions core/lib/patternlab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,6 @@ function buildPatternData(dataFilesPath, fs) {
function processAllPatternsIterative(pattern_assembler, patterns_dir, patternlab) {
diveSync(
patterns_dir,
{
filter: function (thisPath, dir) {
if (dir) {
var remainingPath = thisPath.replace(patterns_dir, '');
var isValidPath = remainingPath.indexOf('/_') === -1;
return isValidPath;
}
return true;
}
},
function (err, file) {
//log any errors
if (err) {
Expand All @@ -56,16 +46,6 @@ function processAllPatternsIterative(pattern_assembler, patterns_dir, patternlab
function processAllPatternsRecursive(pattern_assembler, patterns_dir, patternlab) {
diveSync(
patterns_dir,
{
filter: function (thisPath, dir) {
if (dir) {
var remainingPath = thisPath.replace(patterns_dir, '');
var isValidPath = remainingPath.indexOf('/_') === -1;
return isValidPath;
}
return true;
}
},
function (err, file) {
//log any errors
if (err) {
Expand Down
12 changes: 10 additions & 2 deletions core/lib/ui_builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,16 @@ function addToPatternPaths(patternlab, pattern) {

//todo: refactor this as a method on the pattern object itself once we merge dev with pattern-engines branch
function isPatternExcluded(pattern) {
// returns whether or not the first character of the pattern filename is an underscore, or excluded
return pattern.isPattern && pattern.fileName.charAt(0) === '_';
// returns whether or not the first character of the pattern type, subtype, further nested dirs, or filename is an underscore
if (pattern.isPattern) {
if (
pattern.relPath.charAt(0) === '_' ||
pattern.relPath.indexOf('/_') > -1
) {
return true;
}
}
return false;
}

// Returns the array of patterns to be rendered in the styleguide view and
Expand Down