Skip to content
This repository was archived by the owner on Dec 10, 2019. It is now read-only.

Commit bbeb32c

Browse files
committed
pseudo pattern support added to changelog. a little more dry
closes #33
1 parent dc03af5 commit bbeb32c

File tree

3 files changed

+23
-18
lines changed

3 files changed

+23
-18
lines changed

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ PL-node-v0.8.0
77
- ADD: pattern link support
88
- CHG: updated included mustache templates to reflect pattern links in navigation and compiling pages direct from templates
99
- THX: @getsetbro for finding and fixing a typo
10+
- FIX: fixed a bug preventing pattern states from displaying on the flat template/pages
11+
- ADD: support for basic pseudo-patterns
1012

1113
PL-node-v0.1.7
1214
- ADD: pattern export

builder/pattern_assembler.js

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,25 @@
66

77
var pattern_assembler = function(){
88

9-
function exportPatterns(patternlab){
9+
function setState(pattern, patternlab){
10+
if(patternlab.config.patternStates[pattern.patternName]){
11+
pattern.patternState = patternlab.config.patternStates[pattern.patternName];
12+
} else{
13+
pattern.patternState = "";
14+
}
15+
}
1016

17+
function addPattern(pattern, patternLab){
18+
patternLab.data.link[pattern.patternGroup + '-' + pattern.patternName] = '/patterns/' + pattern.patternLink;
19+
patternLab.patterns.push(pattern);
1120
}
1221

1322
return {
14-
export_patterns: function(patternlab){
15-
exportPatterns(patternlab);
23+
setPatternState: function(pattern, patternlab){
24+
setState(pattern, patternlab);
25+
},
26+
addPattern: function(pattern, patternLab){
27+
addPattern(pattern, patternLab);
1628
}
1729
};
1830

builder/patternlab.js

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,17 +83,14 @@ var patternlab_engine = function(){
8383
return;
8484
}
8585

86-
//check for pattern parameters before we do much else. need to remove them into a data object so the rest of the filename parsing works
86+
//TODO: https://github.com/pattern-lab/patternlab-node/issues/88 check for pattern parameters before we do much else. need to remove them into a data object so the rest of the filename parsing works
87+
//TODO: https://github.com/pattern-lab/patternlab-node/issues/95 check for patternstylemodifiers before we do much else. need to remove these from the template for proper rendering
8788

8889
//make a new Pattern Object
8990
currentPattern = new of.oPattern(subdir, filename, {});
9091

9192
//see if this file has a state
92-
if(patternlab.config.patternStates[currentPattern.patternName]){
93-
currentPattern.patternState = patternlab.config.patternStates[currentPattern.patternName];
94-
} else{
95-
currentPattern.patternState = "";
96-
}
93+
assembler.setPatternState(currentPattern, patternlab);
9794

9895
//look for a json file for this template
9996
try {
@@ -144,11 +141,7 @@ var patternlab_engine = function(){
144141
var patternVariant = new of.oPattern(subdir, currentPattern.fileName + '-' + variantName + '.mustache', variantFileData);
145142

146143
//see if this file has a state
147-
if(patternlab.config.patternStates[patternVariant.patternName]){
148-
patternVariant.patternState = patternlab.config.patternStates[patternVariant.patternName];
149-
} else{
150-
patternVariant.patternState = "";
151-
}
144+
assembler.setPatternState(patternVariant, patternlab);
152145

153146
//use the same template as the non-variant
154147
patternVariant.template = currentPattern.template;
@@ -157,14 +150,12 @@ var patternlab_engine = function(){
157150
lineage_hunter.find_lineage(patternVariant, patternlab);
158151

159152
//add to patternlab object so we can look these up later.
160-
patternlab.data.link[patternVariant.patternGroup + '-' + patternVariant.patternName] = '/patterns/' + patternVariant.patternLink;
161-
patternlab.patterns.push(patternVariant);
153+
assembler.addPattern(patternVariant, patternlab);
162154
}
163155
}
164156

165157
//add to patternlab object so we can look these up later.
166-
patternlab.data.link[currentPattern.patternGroup + '-' + currentPattern.patternName] = '/patterns/' + currentPattern.patternLink;
167-
patternlab.patterns.push(currentPattern);
158+
assembler.addPattern(currentPattern, patternlab);
168159
});
169160

170161
var entity_encoder = new he();

0 commit comments

Comments
 (0)