diff --git a/core/lib/list_item_hunter.js b/core/lib/list_item_hunter.js
index c3aee4d56..e8d278609 100644
--- a/core/lib/list_item_hunter.js
+++ b/core/lib/list_item_hunter.js
@@ -34,7 +34,7 @@ var list_item_hunter = function () {
var repeatedBlockHtml = '';
for (var i = 0; i < items.indexOf(loopNumberString); i++) {
if (patternlab.config.debug) {
- console.log('list item(s) in pattern', pattern.patternName, 'adding', patternBlock, 'to repeatedBlockTemplate');
+ console.log('list item(s) in pattern', pattern.patternPartial, 'adding', patternBlock, 'to repeatedBlockTemplate');
}
repeatedBlockTemplate.push(patternBlock);
}
diff --git a/core/lib/object_factory.js b/core/lib/object_factory.js
index e0ffeb41c..7dad7637d 100644
--- a/core/lib/object_factory.js
+++ b/core/lib/object_factory.js
@@ -22,10 +22,10 @@ var Pattern = function (relPath, data) {
this.jsonFileData = data || {};
// strip leading "00-" from the file name and flip tildes to dashes
- this.patternName = this.fileName.replace(/^\d*\-/, '').replace('~', '-'); // 'colors'
+ this.patternBaseName = this.fileName.replace(/^\d*\-/, '').replace('~', '-'); // 'colors'
// Fancy name. No idea how this works. 'Colors'
- this.patternDisplayName = this.patternName.split('-').reduce(function (val, working) {
+ this.patternName = this.patternBaseName.split('-').reduce(function (val, working) {
return val.charAt(0).toUpperCase() + val.slice(1) + ' ' + working.charAt(0).toUpperCase() + working.slice(1);
}, '').trim(); //this is the display name for the ui. strip numeric + hyphen prefixes
@@ -44,7 +44,7 @@ var Pattern = function (relPath, data) {
// The canonical "key" by which this pattern is known. This is the callable
// name of the pattern. UPDATE: this.key is now known as this.patternPartial
- this.patternPartial = this.patternGroup + '-' + this.patternName;
+ this.patternPartial = this.patternGroup + '-' + this.patternBaseName;
this.template = '';
this.patternPartialCode = '';
diff --git a/core/lib/pattern_assembler.js b/core/lib/pattern_assembler.js
index f24a03141..3fcedf2e8 100644
--- a/core/lib/pattern_assembler.js
+++ b/core/lib/pattern_assembler.js
@@ -76,7 +76,7 @@ var pattern_assembler = function () {
function addPattern(pattern, patternlab) {
//add the link to the global object
- patternlab.data.link[pattern.patternGroup + '-' + pattern.patternName] = '/patterns/' + pattern.patternLink;
+ patternlab.data.link[pattern.patternGroup + '-' + pattern.patternBaseName] = '/patterns/' + pattern.patternLink;
//only push to array if the array doesn't contain this pattern
var isNew = true;
diff --git a/core/lib/patternlab.js b/core/lib/patternlab.js
index a1d73f268..88d0c6a81 100644
--- a/core/lib/patternlab.js
+++ b/core/lib/patternlab.js
@@ -275,7 +275,7 @@ var patternlab_engine = function (config) {
lineageR: pattern.patternLineagesR,
patternLineageEExists: pattern.patternLineageExists || pattern.patternLineageRExists,
patternDesc: pattern.patternDescExists ? pattern.patternDesc : '',
- patternBreadcrumb: 'TODO',
+ patternBreadcrumb: pattern.patternGroup,
patternExtension: pattern.fileExtension,
patternName: pattern.patternName,
patternPartial: pattern.patternPartial,
diff --git a/core/lib/ui_builder.js b/core/lib/ui_builder.js
index 0fb7e6ee2..f2f548066 100644
--- a/core/lib/ui_builder.js
+++ b/core/lib/ui_builder.js
@@ -11,7 +11,7 @@ var eol = require('os').EOL;
function addToPatternPaths(patternlab, patternTypeName, pattern) {
//this is messy, could use a refactor.
- patternlab.patternPaths[patternTypeName][pattern.patternName] = pattern.subdir.replace(/\\/g, '/') + "/" + pattern.fileName;
+ patternlab.patternPaths[patternTypeName][pattern.patternBaseName] = pattern.subdir.replace(/\\/g, '/') + "/" + pattern.fileName;
}
//todo: refactor this as a method on the pattern object itself once we merge dev with pattern-engines branch
diff --git a/test/lineage_hunter_tests.js b/test/lineage_hunter_tests.js
index cb9a70251..1d2fa941f 100644
--- a/test/lineage_hunter_tests.js
+++ b/test/lineage_hunter_tests.js
@@ -61,7 +61,7 @@ exports['lineage hunter '] = {
"data": null,
"template": "![\"Logo](\"../../images/logo.png\")
",
"patternPartialCode": "",
- "patternName": "logo",
+ "patternBaseName": "logo",
"patternLink": "00-atoms-03-images-00-logo/00-atoms-03-images-00-logo.html",
"patternGroup": "atoms",
"patternSubGroup": "atoms\\03-images",
@@ -80,7 +80,7 @@ exports['lineage hunter '] = {
"data": null,
"template": "\r\n",
"patternPartialCode": "\r\n",
- "patternName": "primary-nav",
+ "patternBaseName": "primary-nav",
"patternLink": "01-molecules-05-navigation-00-primary-nav/01-molecules-05-navigation-00-primary-nav.html",
"patternGroup": "molecules",
"patternSubGroup": "molecules\\05-navigation",
@@ -99,7 +99,7 @@ exports['lineage hunter '] = {
"data": null,
"template": "",
"patternPartialCode": "",
- "patternName": "search",
+ "patternBaseName": "search",
"patternLink": "01-molecules-04-forms-00-search/01-molecules-04-forms-00-search.html",
"patternGroup": "molecules",
"patternSubGroup": "molecules\\04-forms",
@@ -303,7 +303,7 @@ exports['lineage hunter '] = {
"data": null,
"template": " {{message}}
",
"extendedTemplate": " {{message}}
",
- "patternName": "error",
+ "patternBaseName": "error",
"patternLink": "01-atoms-05-alerts-00-error/01-atoms-05-alerts-00-error.html",
"patternGroup": "atoms",
"patternSubGroup": "atoms\\05-alerts",
@@ -338,7 +338,7 @@ exports['lineage hunter '] = {
"data": null,
"template": "{{> atoms-error:foo }}",
"extendedTemplate": "{{> atoms-error:foo }}",
- "patternName": "error",
+ "patternBaseName": "error",
"patternLink": "01-molecules-01-toast-00-error/01-molecules-01-toast-00-error.html",
"patternGroup": "molecules",
"patternSubGroup": "molecules\\01-toast",
@@ -359,7 +359,7 @@ exports['lineage hunter '] = {
"data": null,
"template": " {{message}}
",
"extendedTemplate": " {{message}}
",
- "patternName": "error",
+ "patternBaseName": "error",
"patternLink": "01-atoms-05-alerts-00-error/01-atoms-05-alerts-00-error.html",
"patternGroup": "atoms",
"patternSubGroup": "atoms\\05-alerts",
@@ -392,7 +392,7 @@ exports['lineage hunter '] = {
"data": null,
"template": "{{> atoms-error:foo }}",
"extendedTemplate": "{{>atoms-error:foo}}",
- "patternName": "error",
+ "patternBaseName": "error",
"patternLink": "01-molecules-01-toast-00-error/01-molecules-01-toast-00-error.html",
"patternGroup": "molecules",
"patternSubGroup": "molecules\\01-toast",
@@ -413,7 +413,7 @@ exports['lineage hunter '] = {
"data": null,
"template": " {{message}}
",
"extendedTemlpate": " {{message}}
",
- "patternName": "error",
+ "patternBaseName": "error",
"patternLink": "01-atoms-05-alerts-00-error/01-atoms-05-alerts-00-error.html",
"patternGroup": "atoms",
"patternSubGroup": "atoms\\05-alerts",
@@ -446,7 +446,7 @@ exports['lineage hunter '] = {
"data": null,
"template": "{{> atoms-e:foo }}",
"extendedTemplate": "{{>atoms-e:foo}}",
- "patternName": "error",
+ "patternBaseName": "error",
"patternLink": "01-molecules-01-toast-00-error/01-molecules-01-toast-00-error.html",
"patternGroup": "molecules",
"patternSubGroup": "molecules\\01-toast",
@@ -467,7 +467,7 @@ exports['lineage hunter '] = {
"data": null,
"template": " {{message}}
",
"extendedTemplate": " {{message}}
",
- "patternName": "error",
+ "patternBaseName": "error",
"patternLink": "01-atoms-05-alerts-00-error/01-atoms-05-alerts-00-error.html",
"patternGroup": "atoms",
"patternSubGroup": "atoms\\05-alerts",
@@ -507,7 +507,7 @@ exports['lineage hunter '] = {
"data": null,
"template": " {{message}}
",
"extendedTemplate": " {{message}}
",
- "patternName": "error",
+ "patternBaseName": "error",
"patternLink": "01-atoms-05-alerts-00-error/01-atoms-05-alerts-00-error.html",
"patternGroup": "atoms",
"patternSubGroup": "atoms\\05-alerts",
diff --git a/test/object_factory_tests.js b/test/object_factory_tests.js
index 81dc3d59e..b2fdeab5e 100644
--- a/test/object_factory_tests.js
+++ b/test/object_factory_tests.js
@@ -13,8 +13,8 @@
test.equals(p.fileName, '00-colors');
test.equals(p.fileExtension, '.mustache');
test.equals(p.jsonFileData.d, 123);
- test.equals(p.patternName, 'colors');
- test.equals(p.patternDisplayName, 'Colors');
+ test.equals(p.patternBaseName, 'colors');
+ test.equals(p.patternName, 'Colors');
test.equals(p.patternLink, '00-atoms-00-global-00-colors/00-atoms-00-global-00-colors.html');
test.equals(p.patternGroup, 'atoms');
test.equals(p.patternSubGroup, 'global');
@@ -36,8 +36,8 @@
test.equals(p.fileName, '00-colors');
test.equals(p.fileExtension, '.mustache');
test.equals(p.jsonFileData.d, 123);
- test.equals(p.patternName, 'colors');
- test.equals(p.patternDisplayName, 'Colors');
+ test.equals(p.patternBaseName, 'colors');
+ test.equals(p.patternName, 'Colors');
test.equals(p.patternLink, '00-atoms-00-colors/00-atoms-00-colors.html');
test.equals(p.patternGroup, 'atoms');
test.equals(p.flatPatternPath, '00-atoms');
@@ -51,14 +51,8 @@
},
'test Pattern capitalizes patternDisplayName correctly' : function(test){
var p = new Pattern('00-atoms/00-global/00-colors-alt.mustache', { d: 123});
- test.equals(p.patternName, 'colors-alt');
- test.equals(p.patternDisplayName, 'Colors Alt');
- test.done();
- },
- 'test Pattern removes pattern paramter from key correctly' : function(test){
- var p = new Pattern('00-atoms/00-global/00-colors-alt.mustache', { d: 123});
- test.equals(p.patternName, 'colors-alt');
- test.equals(p.patternDisplayName, 'Colors Alt');
+ test.equals(p.patternBaseName, 'colors-alt');
+ test.equals(p.patternName, 'Colors Alt');
test.done();
}
};
diff --git a/test/parameter_hunter_tests.js b/test/parameter_hunter_tests.js
index 17a8c2de8..1019d5569 100644
--- a/test/parameter_hunter_tests.js
+++ b/test/parameter_hunter_tests.js
@@ -9,7 +9,7 @@
"fileName": "01-sticky-comment",
"subdir": "02-organisms/02-comments",
"name": "02-organisms-02-comments-01-sticky-comment",
- "patternName": "sticky-comment",
+ "patternBaseName": "sticky-comment",
"patternLink": "02-organisms-02-comments-01-sticky-comment/02-organisms-02-comments-01-sticky-comment.html",
"patternGroup": "organisms",
"patternSubGroup": "comments",
@@ -31,7 +31,7 @@
"fileName": "02-single-comment",
"subdir": "01-molecules/06-components",
"name": "01-molecules-06-components-02-single-comment",
- "patternName": "single-comment",
+ "patternBaseName": "single-comment",
"patternLink": "01-molecules-06-components-02-single-comment/01-molecules-06-components-02-single-comment.html",
"patternGroup": "molecules",
"patternSubGroup": "components",