|
1 | | -/* |
2 | | - * patternlab-node - v1.2.2 - 2016 |
3 | | - * |
| 1 | +/* |
| 2 | + * patternlab-node - v1.2.2 - 2016 |
| 3 | + * |
4 | 4 | * Brian Muenzenmeyer, and the web community. |
5 | | - * Licensed under the MIT license. |
6 | | - * |
7 | | - * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. |
| 5 | + * Licensed under the MIT license. |
| 6 | + * |
| 7 | + * Many thanks to Brad Frost and Dave Olsen for inspiration, encouragement, and advice. |
8 | 8 | * |
9 | 9 | */ |
10 | 10 |
|
@@ -123,12 +123,13 @@ var lineage_hunter = function () { |
123 | 123 | var lineageRPattern = pattern_assembler.get_pattern_by_key(pattern.lineageRIndex[j], patternlab); |
124 | 124 |
|
125 | 125 | //only set patternState if pattern.patternState "is less than" the lineageRPattern.patternstate |
| 126 | + //or if lineageRPattern.patternstate (the consuming pattern) does not have a state |
126 | 127 | //this makes patternlab apply the lowest common ancestor denominator |
127 | | - if (patternlab.config.patternStateCascade.indexOf(pattern.patternState) |
128 | | - < patternlab.config.patternStateCascade.indexOf(lineageRPattern.patternState)) { |
| 128 | + if (lineageRPattern.patternState === '' || (patternlab.config.patternStateCascade.indexOf(pattern.patternState) |
| 129 | + < patternlab.config.patternStateCascade.indexOf(lineageRPattern.patternState))) { |
129 | 130 |
|
130 | 131 | if (patternlab.config.debug) { |
131 | | - console.log('Found a lower common denominator pattern state: ' + pattern.patternState + ' on ' + pattern.key + '. Setting reverse lineage pattern ' + lineageRPattern.key + ' from ' + lineageRPattern.patternState); |
| 132 | + console.log('Found a lower common denominator pattern state: ' + pattern.patternState + ' on ' + pattern.key + '. Setting reverse lineage pattern ' + lineageRPattern.key + ' from ' + (lineageRPattern.patternState === '' ? '<<blank>>' : lineageRPattern.patternState)); |
132 | 133 | } |
133 | 134 |
|
134 | 135 | lineageRPattern.patternState = pattern.patternState; |
|
0 commit comments