Skip to content

Commit b5423e0

Browse files
committed
fix more pesky whitespace/tabs
1 parent f951fd5 commit b5423e0

File tree

3 files changed

+75
-75
lines changed

3 files changed

+75
-75
lines changed

builder/style_modifier_hunter.js

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
/*
2-
* patternlab-node - v0.14.0 - 2015
3-
*
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.
8-
*
9-
*/
2+
* patternlab-node - v0.14.0 - 2015
3+
*
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.
8+
*
9+
*/
1010

1111
(function () {
1212
"use strict";
1313

1414
var style_modifier_hunter = function(){
1515

1616
function consumestylemodifier(pattern, partial, patternlab){
17-
18-
//extract the classname from the stylemodifier which comes in the format of :className
19-
var styleModifier = partial.match(/:([\w\-_])+/g) ? partial.match(/:([\w\-_])+/g)[0].slice(1) : null;
20-
if(styleModifier){
21-
22-
if(patternlab.config.debug){
23-
console.log('found partial styleModifier within pattern ' + pattern.key);
24-
}
25-
26-
//replace the stylemodifier placeholder with the class name
27-
pattern.extendedTemplate = pattern.extendedTemplate.replace('{{styleModifier}}', styleModifier);
28-
}
17+
18+
//extract the classname from the stylemodifier which comes in the format of :className
19+
var styleModifier = partial.match(/:([\w\-_])+/g) ? partial.match(/:([\w\-_])+/g)[0].slice(1) : null;
20+
if(styleModifier){
21+
22+
if(patternlab.config.debug){
23+
console.log('found partial styleModifier within pattern ' + pattern.key);
24+
}
25+
26+
//replace the stylemodifier placeholder with the class name
27+
pattern.extendedTemplate = pattern.extendedTemplate.replace('{{styleModifier}}', styleModifier);
28+
}
2929
}
3030

3131
return {

test/pattern_assembler_tests.js

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88

99
//setup current pattern from what we would have during execution
1010
var currentPattern = {
11-
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment(description: 'A life is like a garden. Perfect moments can be had, but not preserved, except in memory.') }}</div>",
11+
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment(description: 'A life is like a garden. Perfect moments can be had, but not preserved, except in memory.') }}</div>",
1212
};
1313

1414
var pattern_assembler = new pa();
1515

16-
var results = pattern_assembler.find_pattern_partials(currentPattern);
17-
test.equals(results.length, 2);
16+
var results = pattern_assembler.find_pattern_partials(currentPattern);
17+
test.equals(results.length, 2);
1818
test.equals(results[0], '{{> molecules-comment-header}}');
1919
test.equals(results[1], '{{> molecules-single-comment(description: \'A life is like a garden. Perfect moments can be had, but not preserved, except in memory.\') }}');
2020

@@ -42,13 +42,13 @@
4242

4343
//setup current pattern from what we would have during execution
4444
var currentPattern = {
45-
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo }}</div>",
45+
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo }}</div>",
4646
};
4747

4848
var pattern_assembler = new pa();
4949

50-
var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
51-
test.equals(results.length, 1);
50+
var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
51+
test.equals(results.length, 1);
5252
test.equals(results[0], '{{> molecules-single-comment:foo }}');
5353

5454
test.done();
@@ -58,7 +58,7 @@
5858

5959
//setup current pattern from what we would have during execution
6060
var currentPattern = {
61-
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo(bar:'baz') }}</div>",
61+
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo(bar:'baz') }}</div>",
6262
};
6363

6464
var pattern_assembler = new pa();
@@ -74,13 +74,13 @@
7474

7575
//setup current pattern from what we would have during execution
7676
var currentPattern = {
77-
"template": "<h1>{{> 01-molecules/06-components/molecules-comment-header}}</h1><div>{{> 01-molecules/06-components/molecules-single-comment:foo }}</div>",
77+
"template": "<h1>{{> 01-molecules/06-components/molecules-comment-header}}</h1><div>{{> 01-molecules/06-components/molecules-single-comment:foo }}</div>",
7878
};
7979

8080
var pattern_assembler = new pa();
8181

82-
var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
83-
test.equals(results.length, 1);
82+
var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
83+
test.equals(results.length, 1);
8484
test.equals(results[0], '{{> 01-molecules/06-components/molecules-single-comment:foo }}');
8585

8686
test.done();
@@ -90,13 +90,13 @@
9090

9191
//setup current pattern from what we would have during execution
9292
var currentPattern = {
93-
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment }}</div>",
93+
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment }}</div>",
9494
};
9595

9696
var pattern_assembler = new pa();
9797

98-
var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
99-
test.equals(results, null);
98+
var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
99+
test.equals(results, null);
100100

101101
test.done();
102102
},
@@ -105,13 +105,13 @@
105105

106106
//setup current pattern from what we would have during execution
107107
var currentPattern = {
108-
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment(foo: 'bar') }}</div>",
108+
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment(foo: 'bar') }}</div>",
109109
};
110110

111111
var pattern_assembler = new pa();
112112

113-
var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
114-
test.equals(results, null);
113+
var results = pattern_assembler.find_pattern_partials_with_style_modifiers(currentPattern);
114+
test.equals(results, null);
115115

116116
test.done();
117117
},
@@ -120,13 +120,13 @@
120120

121121
//setup current pattern from what we would have during execution
122122
var currentPattern = {
123-
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment(bar:'baz') }}</div>",
123+
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment(bar:'baz') }}</div>",
124124
};
125125

126126
var pattern_assembler = new pa();
127127

128-
var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
129-
test.equals(results.length, 1);
128+
var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
129+
test.equals(results.length, 1);
130130
test.equals(results[0], "{{> molecules-single-comment(bar:'baz') }}");
131131

132132
test.done();
@@ -137,13 +137,13 @@
137137

138138
//setup current pattern from what we would have during execution
139139
var currentPattern = {
140-
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo(bar:'baz') }}</div>",
140+
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo(bar:'baz') }}</div>",
141141
};
142142

143143
var pattern_assembler = new pa();
144144

145-
var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
146-
test.equals(results.length, 1);
145+
var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
146+
test.equals(results.length, 1);
147147
test.equals(results[0], "{{> molecules-single-comment:foo(bar:'baz') }}");
148148

149149
test.done();
@@ -154,13 +154,13 @@
154154

155155
//setup current pattern from what we would have during execution
156156
var currentPattern = {
157-
"template": "<h1>{{> 01-molecules/06-components/molecules-comment-header}}</h1><div>{{> 01-molecules/06-components/molecules-single-comment(bar:'baz') }}</div>",
157+
"template": "<h1>{{> 01-molecules/06-components/molecules-comment-header}}</h1><div>{{> 01-molecules/06-components/molecules-single-comment(bar:'baz') }}</div>",
158158
};
159159

160160
var pattern_assembler = new pa();
161161

162-
var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
163-
test.equals(results.length, 1);
162+
var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
163+
test.equals(results.length, 1);
164164
test.equals(results[0], "{{> 01-molecules/06-components/molecules-single-comment(bar:'baz') }}");
165165

166166
test.done();
@@ -171,13 +171,13 @@
171171

172172
//setup current pattern from what we would have during execution
173173
var currentPattern = {
174-
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment }}</div>",
174+
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment }}</div>",
175175
};
176176

177177
var pattern_assembler = new pa();
178178

179-
var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
180-
test.equals(results, null);
179+
var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
180+
test.equals(results, null);
181181

182182
test.done();
183183
},
@@ -186,13 +186,13 @@
186186

187187
//setup current pattern from what we would have during execution
188188
var currentPattern = {
189-
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo }}</div>",
189+
"template": "<h1>{{> molecules-comment-header}}</h1><div>{{> molecules-single-comment:foo }}</div>",
190190
};
191191

192192
var pattern_assembler = new pa();
193193

194-
var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
195-
test.equals(results, null);
194+
var results = pattern_assembler.find_pattern_partials_with_parameters(currentPattern);
195+
test.equals(results, null);
196196

197197
test.done();
198198
},

test/style_modifier_hunter_tests.js

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11
(function () {
2-
"use strict";
2+
"use strict";
33

44
var smh = require('../builder/style_modifier_hunter');
55

66
exports['consume_style_modifier'] = {
77
'uses the partial stylemodifer to modify the patterns extendedTemplate' : function(test){
8-
//arrange
8+
//arrange
99
var pl = {};
10-
pl.config = {};
11-
pl.config.debug = false;
10+
pl.config = {};
11+
pl.config.debug = false;
1212

13-
var pattern = {
14-
extendedTemplate: '<div class="foo {{styleModifier}}"></div>'
15-
};
13+
var pattern = {
14+
extendedTemplate: '<div class="foo {{styleModifier}}"></div>'
15+
};
1616

1717
var style_modifier_hunter = new smh();
1818

19-
//act
19+
//act
2020
style_modifier_hunter.consume_style_modifier(pattern, '{{> partial:bar}}', pl);
2121

22-
//assert
22+
//assert
2323
test.equals(pattern.extendedTemplate, '<div class="foo bar"></div>');
2424
test.done();
2525
},
26-
'does not alter pattern extendedTemplate if styleModifier not found in partial' : function(test){
27-
//arrange
28-
var pl = {};
29-
pl.config = {};
30-
pl.config.debug = false;
26+
'does not alter pattern extendedTemplate if styleModifier not found in partial' : function(test){
27+
//arrange
28+
var pl = {};
29+
pl.config = {};
30+
pl.config.debug = false;
3131

32-
var pattern = {
33-
extendedTemplate: '<div class="foo {{styleModifier}}"></div>'
34-
};
32+
var pattern = {
33+
extendedTemplate: '<div class="foo {{styleModifier}}"></div>'
34+
};
3535

36-
var style_modifier_hunter = new smh();
36+
var style_modifier_hunter = new smh();
3737

38-
//act
39-
style_modifier_hunter.consume_style_modifier(pattern, '{{> partial}}', pl);
38+
//act
39+
style_modifier_hunter.consume_style_modifier(pattern, '{{> partial}}', pl);
4040

41-
//assert
42-
test.equals(pattern.extendedTemplate, '<div class="foo {{styleModifier}}"></div>');
43-
test.done();
44-
}
41+
//assert
42+
test.equals(pattern.extendedTemplate, '<div class="foo {{styleModifier}}"></div>');
43+
test.done();
44+
}
4545
};
4646

4747
}());

0 commit comments

Comments
 (0)