Skip to content

Commit 8467b20

Browse files
committed
fix: move html cleaner to a more apropriate place
1 parent f6becee commit 8467b20

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

core/lib/object_factory.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
var patternEngines = require('./pattern_engines');
44
var path = require('path');
55
var extend = require('util')._extend;
6-
var cleanHtml = require('js-beautify').html;
76

87
// Pattern properties
98

@@ -74,7 +73,7 @@ Pattern.prototype = {
7473
// render function
7574
render: function (data, partials) {
7675
if (this.engine) {
77-
return cleanHtml(this.engine.renderPattern(this, data || this.jsonFileData, partials));
76+
return this.engine.renderPattern(this, data || this.jsonFileData, partials);
7877
}
7978
return null;
8079
},

core/lib/patternlab.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ var diveSync = require('diveSync'),
1414
glob = require('glob'),
1515
_ = require('lodash'),
1616
path = require('path'),
17-
plutils = require('./utilities');
17+
plutils = require('./utilities'),
18+
cleanHtml = require('js-beautify').html;
1819

1920
function buildPatternData(dataFilesPath, fs) {
2021
var dataFiles = glob.sync(dataFilesPath + '*.json', {"ignore" : [dataFilesPath + 'listitems.json']});
@@ -386,13 +387,16 @@ var patternlab_engine = function (config) {
386387

387388
//write the compiled template to the public patterns directory
388389
var patternPage = headHTML + pattern.patternPartialCode + footerHTML;
390+
var cleanedPatternPage = cleanHtml(patternPage);
391+
var cleanedPatternPartialCode = cleanHtml(pattern.patternPartialCode);
392+
389393
fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'rendered'), patternPage);
390394

391395
//write the mustache file too
392396
fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'rawTemplate'), pattern.template);
393397

394398
//write the encoded version too
395-
fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'markupOnly'), pattern.patternPartialCode);
399+
fs.outputFileSync(paths.public.patterns + pattern.getPatternLink(patternlab, 'markupOnly'), cleanedPatternPartialCode);
396400

397401
return true;
398402
});

0 commit comments

Comments
 (0)