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

Fix the verbose partial #559 #675

Merged
merged 4 commits into from
Sep 11, 2017
Merged

Fix the verbose partial #559 #675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2111d6f
Fixed Slack channel link
iansoper Aug 3, 2017
3f7093c
Merge pull request #674 from iansoper/patch-1
bradfrost Aug 8, 2017
78d2f29
Fix the verbose partial #559
Aug 11, 2017
a3679e5
Fix the tests for #599
Aug 11, 2017
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ Please read the guidelines: https://github.com/pattern-lab/patternlab-node/blob/

The Pattern Lab Node team uses [our gitter.im channel, pattern-lab/node](https://gitter.im/pattern-lab/node) to keep in sync, share updates, and talk shop. Please stop by to say hello or as a first place to turn if stuck. Other channels in the Pattern Lab organization can be found on gitter too.

There is also a dedicated Pattern Lab channel on the [design system slack](designsystems.herokuapp.com) run by [@jina](https://twitter.com/jina).
There is also a dedicated Pattern Lab channel on the [design system slack](http://designsystems.herokuapp.com) run by [@jina](https://twitter.com/jina).

Ask or answer Pattern Lab questions on Stack Overflow: http://stackoverflow.com/questions/tagged/patternlab.io

Expand Down
2 changes: 1 addition & 1 deletion core/lib/object_factory.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ var Pattern = function (relPath, data, patternlab) {

// Let's calculate the verbose name ahead of time! We don't use path.sep here
// on purpose. This isn't a file name!
this.verbosePartial = this.subdir + '/' + this.fileName;
this.verbosePartial = this.subdir.split(path.sep).join('/') + '/' + this.fileName;

this.isPattern = true;
this.isFlatPattern = this.patternGroup === this.patternSubGroup;
Expand Down
2 changes: 1 addition & 1 deletion core/lib/pattern_assembler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ var pattern_assembler = function () {
for (var i = 0; i < patternlab.patterns.length; i++) {
switch (partialName) {
case patternlab.patterns[i].relPath:
case patternlab.patterns[i].subdir + '/' + patternlab.patterns[i].fileName:
case patternlab.patterns[i].verbosePartial:
return patternlab.patterns[i];
}
}
Expand Down
2 changes: 1 addition & 1 deletion core/lib/pattern_registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ PatternRegistry.prototype = {
for (let thisPattern of patterns) {
switch (partialName) {
case thisPattern.relPath:
case thisPattern.subdir + '/' + thisPattern.fileName:
case thisPattern.verbosePartial:
return thisPattern;
}
}
Expand Down
2 changes: 2 additions & 0 deletions test/parameter_hunter_tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ function currentPatternClosure() {
"relPath": "02-organisms/02-comments/01-sticky-comment.mustache",
"fileName": "01-sticky-comment",
"subdir": "02-organisms/02-comments",
"verbosePartial": "02-organisms/02-comments/01-sticky-comment",
"name": "02-organisms-02-comments-01-sticky-comment",
"patternBaseName": "sticky-comment",
"patternLink": "02-organisms-02-comments-01-sticky-comment/02-organisms-02-comments-01-sticky-comment.html",
Expand All @@ -40,6 +41,7 @@ function patternlabClosure() {
"relPath": "01-molecules/06-components/02-single-comment.mustache",
"fileName": "02-single-comment",
"subdir": "01-molecules/06-components",
"verbosePartial": "01-molecules/06-components/02-single-comment",
"name": "01-molecules-06-components-02-single-comment",
"patternBaseName": "single-comment",
"patternLink": "01-molecules-06-components-02-single-comment/01-molecules-06-components-02-single-comment.html",
Expand Down