Skip to content

0.0.5 #18

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

Closed
wants to merge 3 commits into from
Closed

0.0.5 #18

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
81e6671
only copy images
bmuenzenmeyer Nov 7, 2013
3a2891d
watch _data/*.json too
bmuenzenmeyer Nov 7, 2013
8c87fb8
do not render sub menus when not needed
bmuenzenmeyer Dec 13, 2013
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
7 changes: 7 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.

PL-node-v0.0.5
- FIX: type in organisms global header
- FIX: flat-structured pattern items rendered as if they had sub-menus #4
- ADD: Load all grunt tasks using matchdep
- THX: thanks to @colynb for the typo heads up
- THX: shoutout to @joemcgill for better dependency loading

PL-node-v0.0.4
- ADD: an explicit MIT license

Expand Down
6 changes: 3 additions & 3 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ module.exports = function(grunt) {
files: [
{ expand: true, cwd: './source/js/', src: '*', dest: './public/js/'},
{ expand: true, cwd: './source/css/', src: 'style.css', dest: './public/css/' },
{ expand: true, cwd: './source/images/', src: '*', dest: './public/images/' },
{ expand: true, cwd: './source/images/sample/', src: '*', dest: './public/images/sample/'},
{ expand: true, cwd: './source/images/', src: ['*.png', '*.jpg', '*.gif', '*.jpeg'], dest: './public/images/' },
{ expand: true, cwd: './source/images/sample/', src: ['*.png', '*.jpg', '*.gif', '*.jpeg'], dest: './public/images/sample/'},
{ expand: true, cwd: './source/fonts/', src: '*', dest: './public/fonts/'}
]
}
Expand All @@ -49,7 +49,7 @@ module.exports = function(grunt) {
tasks: ['default']
},
data: {
files: ['source/_patterns/**/*.json'],
files: ['source/_patterns/**/*.json', 'source/_data/*.json'],
tasks: ['default']
}
}
Expand Down
101 changes: 57 additions & 44 deletions builder/patternlab.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,6 @@ module.exports = function(grunt) {

//build the patternlab website
var patternlabSiteTemplate = grunt.file.read('./source/_patternlab-files/index.mustache');

//the patternlab site requires a lot of partials to be rendered.
//patternNav.
var patternNavTemplate = grunt.file.read('./source/_patternlab-files/partials/patternNav.mustache');

//loop through all patterns. deciding to do this separate from the recursion, even at a performance hit, to attempt to separate the tasks of styleguide creation versus site menu creation
for(var i = 0; i < patternlab.patterns.length; i++){
Expand All @@ -174,7 +170,13 @@ module.exports = function(grunt) {
//get the navSubItem
var navSubItemName = pattern.patternName.replace(/-/g, ' ');

grunt.log.writeln('new bucket found: ' + bucketName + " " + navItemName + " " + navSubItemName);
//grunt.log.writeln('new bucket found: ' + bucketName + " " + navItemName + " " + navSubItemName);

//test whether the pattern struture is flat or not - usually due to a template or page
var flatPatternItem = false;
if(navItemName === bucketName){
flatPatternItem = true;
}

//assume the navItem does not exist.
var navItem = new oNavItem(navItemName);
Expand All @@ -184,18 +186,28 @@ module.exports = function(grunt) {
navSubItem.patternPath = pattern.patternLink;
navSubItem.patternPartial = bucketName + "-" + navSubItemName;

//TODO patternItems....
//if it is flat - we should not add the pattern to patternPaths
if(flatPatternItem){
//grunt.log.writeln('flat source structure found for ' + navItemName + " " + bucketName);

//add the navItem to patternItems
bucket.patternItems.push(navSubItem);

} else{
//add the more complex nav items
bucket.navItems.push(navItem);
bucket.navItemsIndex.push(navItemName);
navItem.navSubItems.push(navSubItem);
navItem.navSubItemsIndex.push(navSubItemName);

//add to patternPaths
patternlab.patternPaths[bucketName][navSubItemName] = pattern.subdir + "/" + pattern.filename.substring(0, pattern.filename.indexOf('.'));
}

//add everything
navItem.navSubItems.push(navSubItem);
navItem.navSubItemsIndex.push(navSubItemName);
bucket.navItems.push(navItem);
bucket.navItemsIndex.push(navItemName);
//add the bucket.
patternlab.buckets.push(bucket);
patternlab.bucketIndex.push(bucketName);

//add to patternPaths
patternlab.patternPaths[bucketName][navSubItemName] = pattern.subdir + "/" + pattern.filename.substring(0, pattern.filename.indexOf('.'));

//done

Expand All @@ -207,52 +219,50 @@ module.exports = function(grunt) {
var navItemName = pattern.subdir.split('-').pop();

//get the navSubItem
var navSubItemName = pattern.patternName.replace(/-/g, ' ');;

//check to see if navItem exists
var navItemIndex = bucket.navItemsIndex.indexOf(navItemName);
if(navItemIndex === -1){
var navSubItemName = pattern.patternName.replace(/-/g, ' ');

var navItem = new oNavItem(navItemName);
//assume the navSubItem does not exist.
var navSubItem = new oNavSubItem(navSubItemName);
navSubItem.patternPath = pattern.patternLink;
navSubItem.patternPartial = bucketName + "-" + navSubItemName;

//assume the navSubItem does not exist.
var navSubItem = new oNavSubItem(navSubItemName);
navSubItem.patternPath = pattern.patternLink;
navSubItem.patternPartial = bucketName + "-" + navSubItemName;
//test whether the pattern struture is flat or not - usually due to a template or page
var flatPatternItem = false;
if(navItemName === bucketName){
flatPatternItem = true;
}

//add the navItem and navSubItem
navItem.navSubItems.push(navSubItem);
navItem.navSubItemsIndex.push(navSubItemName);
bucket.navItems.push(navItem);
bucket.navItemsIndex.push(navItemName);
//if it is flat - we should not add the pattern to patternPaths
if(flatPatternItem){
//grunt.log.writeln('flat source structure found for ' + navItemName + " " + bucketName);

//add the navItem to patternItems
bucket.patternItems.push(navSubItem);
} else{
var navItem = bucket.navItems[navItemIndex];
//check to see if navItem exists
var navItemIndex = bucket.navItemsIndex.indexOf(navItemName);
if(navItemIndex === -1){

//check to see if the navSubItem exists
var navSubItemIndex = navItem.navSubItemsIndex.indexOf(navSubItemName);
if(navSubItemIndex === -1){
var navItem = new oNavItem(navItemName);

var navSubItem = new oNavSubItem(navSubItemName);
navSubItem.patternPath = pattern.patternLink;
navSubItem.patternPartial = bucketName + "-" + navSubItemName;

//add the navSubItem
//add the navItem and navSubItem
navItem.navSubItems.push(navSubItem);
navItem.navSubItemsIndex.push(navSubItemName);
bucket.navItems.push(navItem);
bucket.navItemsIndex.push(navItemName);

} else{

var navSubItem = navItem.navSubItems[navSubItemsIndex];

navSubItem.patternPath = pattern.patternLink;
navSubItem.patternPartial = bucketName + "-" + navSubItemName;
//add the navSubItem
var navItem = bucket.navItems[navItemIndex];
navItem.navSubItems.push(navSubItem);
navItem.navSubItemsIndex.push(navSubItemName);
}

//add to patternPaths
patternlab.patternPaths[bucketName][navSubItemName] = pattern.subdir + "/" + pattern.filename.substring(0, pattern.filename.indexOf('.'));

}

//add to patternPaths
patternlab.patternPaths[bucketName][navSubItemName] = pattern.subdir + "/" + pattern.filename.substring(0, pattern.filename.indexOf('.'));

//check to see if this bucket has a View All yet. If not, add it.
// var navItem = bucket.navItems[navItemIndex];
Expand Down Expand Up @@ -290,6 +300,9 @@ module.exports = function(grunt) {

};

//the patternlab site requires a lot of partials to be rendered.
//patternNav
var patternNavTemplate = grunt.file.read('./source/_patternlab-files/partials/patternNav.mustache');
var patternNavPartialHtml = mustache.render(patternNavTemplate, patternlab);

//ishControls
Expand Down