Skip to content
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

Pass the sorted styleguidePatterns data structure to buildViewAllPages() #397

Merged
merged 1 commit into from
Jul 18, 2016
Merged

Pass the sorted styleguidePatterns data structure to buildViewAllPages() #397

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 16 additions & 16 deletions core/lib/ui_builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,15 +299,15 @@ function buildViewAllHTML(patternlab, patterns, patternPartial) {
return viewAllHTML;
}

function buildViewAllPages(mainPageHeadHtml, patternlab) {
function buildViewAllPages(mainPageHeadHtml, patternlab, styleguidePatterns) {
var paths = patternlab.config.paths;
var prevSubdir = '';
var prevGroup = '';
var i;

for (i = 0; i < patternlab.patterns.length; i++) {
for (i = 0; i < styleguidePatterns.length; i++) {

var pattern = patternlab.patterns[i];
var pattern = styleguidePatterns[i];

// skip underscore-prefixed files
if (isPatternExcluded(pattern)) {
Expand Down Expand Up @@ -336,29 +336,29 @@ function buildViewAllPages(mainPageHeadHtml, patternlab) {
var j;


for (j = 0; j < patternlab.patterns.length; j++) {
for (j = 0; j < styleguidePatterns.length; j++) {


if (patternlab.patterns[j].patternGroup === pattern.patternGroup) {
if (styleguidePatterns[j].patternGroup === pattern.patternGroup) {
//again, skip any sibling patterns to the current one that may have underscores

if (isPatternExcluded(patternlab.patterns[j])) {
if (isPatternExcluded(styleguidePatterns[j])) {
if (patternlab.config.debug) {
console.log('Omitting ' + patternlab.patterns[j].patternPartial + " from view all sibling rendering.");
console.log('Omitting ' + styleguidePatterns[j].patternPartial + " from view all sibling rendering.");
}
continue;
}

//this is meant to be a homepage that is not present anywhere else
if (patternlab.patterns[j].patternPartial === patternlab.config.defaultPattern) {
if (styleguidePatterns[j].patternPartial === patternlab.config.defaultPattern) {
if (patternlab.config.debug) {
console.log('Omitting ' + pattern.patternPartial + ' from view all sibling rendering because it is defined as a defaultPattern');
}
continue;
}


viewAllPatterns.push(patternlab.patterns[j]);
viewAllPatterns.push(styleguidePatterns[j]);
}
}

Expand All @@ -379,26 +379,26 @@ function buildViewAllPages(mainPageHeadHtml, patternlab) {
viewAllPatterns = [];
patternPartial = "viewall-" + pattern.patternGroup + "-" + pattern.patternSubGroup;

for (j = 0; j < patternlab.patterns.length; j++) {
for (j = 0; j < styleguidePatterns.length; j++) {

if (patternlab.patterns[j].subdir === pattern.subdir) {
if (styleguidePatterns[j].subdir === pattern.subdir) {
//again, skip any sibling patterns to the current one that may have underscores
if (isPatternExcluded(patternlab.patterns[j])) {
if (isPatternExcluded(styleguidePatterns[j])) {
if (patternlab.config.debug) {
console.log('Omitting ' + patternlab.patterns[j].patternPartial + " from view all sibling rendering.");
console.log('Omitting ' + styleguidePatterns[j].patternPartial + " from view all sibling rendering.");
}
continue;
}

//this is meant to be a homepage that is not present anywhere else
if (patternlab.patterns[j].patternPartial === patternlab.config.defaultPattern) {
if (styleguidePatterns[j].patternPartial === patternlab.config.defaultPattern) {
if (patternlab.config.debug) {
console.log('Omitting ' + pattern.patternPartial + ' from view all sibling rendering because it is defined as a defaultPattern');
}
continue;
}

viewAllPatterns.push(patternlab.patterns[j]);
viewAllPatterns.push(styleguidePatterns[j]);
}

}
Expand Down Expand Up @@ -446,7 +446,7 @@ function buildFrontEnd(patternlab) {
styleguidePatterns = assembleStyleguidePatterns(patternlab);

//sort all patterns explicitly.
patternlab.patterns = sortPatterns(styleguidePatterns);
styleguidePatterns = sortPatterns(styleguidePatterns);

//set the pattern-specific header by compiling the general-header with data, and then adding it to the meta header
var headerPartial = pattern_assembler.renderPattern(patternlab.header, {
Expand Down