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.

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

Merging changes for patternlab 0.8.0 #96

Merged
merged 21 commits into from
Feb 11, 2015
Merged
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
323f1ae
Fix typos.
Dec 19, 2014
578d149
pattern export. closes #82
bmuenzenmeyer Jan 9, 2015
c2c256f
Updated patternlab devDependencies. Closes #79
bmuenzenmeyer Jan 9, 2015
d3607f9
Merge branch 'master' of https://github.com/seanhussey/patternlab-nod…
bmuenzenmeyer Jan 9, 2015
2e8183a
fixed a typo. updated CHANGELOG. added styleguide-specific.scss to th…
bmuenzenmeyer Jan 9, 2015
031d7e7
added livereload option to the sass watch
bmuenzenmeyer Jan 12, 2015
1e35529
added encoded html and mustache versions of rendered patterns for the…
bmuenzenmeyer Jan 12, 2015
5fb37c2
removing PHP listeners. closes #76
bmuenzenmeyer Jan 22, 2015
abf83e6
pages can be built from templates if needed. closes #5
bmuenzenmeyer Feb 7, 2015
631c703
updated default pattern data and the home page to reflect a new struc…
bmuenzenmeyer Feb 7, 2015
523df6a
Support for patternlinks. Included these in the default nav templates…
bmuenzenmeyer Feb 7, 2015
392bed8
fixed unit test
bmuenzenmeyer Feb 7, 2015
15eae93
prep for 0.8.0 release
bmuenzenmeyer Feb 7, 2015
4dee74d
documentation for pattern links
bmuenzenmeyer Feb 7, 2015
51ee958
Update 05-inline-elements.mustache
getsetbro Feb 7, 2015
5517416
refactored to better utilize the pattern object constructor. less loc…
bmuenzenmeyer Feb 7, 2015
453497f
Merge pull request #93 from getsetbro/patch-2
Feb 7, 2015
53a3091
working version of pseudo patterns without DRYness
bmuenzenmeyer Feb 11, 2015
dc03af5
fixed a bug preventing template/page pattern states from displaying
bmuenzenmeyer Feb 11, 2015
bbeb32c
pseudo pattern support added to changelog. a little more dry
bmuenzenmeyer Feb 11, 2015
727cb79
Pseudopattern documentation. I really dont like including this here w…
bmuenzenmeyer Feb 11, 2015
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
Prev Previous commit
Next Next commit
pseudo pattern support added to changelog. a little more dry
closes #33
  • Loading branch information
bmuenzenmeyer committed Feb 11, 2015

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit bbeb32cdf0334ed58216397ffee81a3b4382f37a
2 changes: 2 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -7,6 +7,8 @@ PL-node-v0.8.0
- ADD: pattern link support
- CHG: updated included mustache templates to reflect pattern links in navigation and compiling pages direct from templates
- THX: @getsetbro for finding and fixing a typo
- FIX: fixed a bug preventing pattern states from displaying on the flat template/pages
- ADD: support for basic pseudo-patterns

PL-node-v0.1.7
- ADD: pattern export
18 changes: 15 additions & 3 deletions builder/pattern_assembler.js
Original file line number Diff line number Diff line change
@@ -6,13 +6,25 @@

var pattern_assembler = function(){

function exportPatterns(patternlab){
function setState(pattern, patternlab){
if(patternlab.config.patternStates[pattern.patternName]){
pattern.patternState = patternlab.config.patternStates[pattern.patternName];
} else{
pattern.patternState = "";
}
}

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

return {
export_patterns: function(patternlab){
exportPatterns(patternlab);
setPatternState: function(pattern, patternlab){
setState(pattern, patternlab);
},
addPattern: function(pattern, patternLab){
addPattern(pattern, patternLab);
}
};

21 changes: 6 additions & 15 deletions builder/patternlab.js
Original file line number Diff line number Diff line change
@@ -83,17 +83,14 @@ var patternlab_engine = function(){
return;
}

//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
//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
//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

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

//see if this file has a state
if(patternlab.config.patternStates[currentPattern.patternName]){
currentPattern.patternState = patternlab.config.patternStates[currentPattern.patternName];
} else{
currentPattern.patternState = "";
}
assembler.setPatternState(currentPattern, patternlab);

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

//see if this file has a state
if(patternlab.config.patternStates[patternVariant.patternName]){
patternVariant.patternState = patternlab.config.patternStates[patternVariant.patternName];
} else{
patternVariant.patternState = "";
}
assembler.setPatternState(patternVariant, patternlab);

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

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

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

var entity_encoder = new he();