Labyricorn/liquidjs
1
0
Fork 0
mirror of https://github.com/harttle/liquidjs.git synced 2026-09-15 04:10:40 -07:00
Code Issues Packages Projects Releases Wiki Activity

feature: whitespace control, fixes #17

Browse Source
This commit is contained in:
harttle
2016-12-26 23:23:58 +08:00
parent fbb1dc8a36
commit 564d9cd9f4
6 changed files with 113 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tokenizer.js
+12 -2
View File
@@ -3,11 +3,13 @@ const TokenizationError = require('./util/error.js').TokenizationError;
const _ = require('./util/underscore.js');
const assert = require('../src/util/assert.js');
function parse(html, filepath) {
function parse(html, filepath, options) {
assert(_.isString(html), 'illegal input type');
html = whiteSpaceCtrl(html, options);
var tokens = [];
var syntax = /({%(.*?)%})|({{(.*?)}})/g;
var syntax = /({%-?(.*?)-?%})|({{-?(.*?)-?}})/g;
var result, htmlFragment, token;
var lastMatchEnd = 0, lastMatchBegin = -1, parsedLinesCount = 0;
@@ -71,4 +73,12 @@ function parse(html, filepath) {
}
}
function whiteSpaceCtrl(html, options){
options = options || {};
var rLeft = options.trim_left ? /\s+({[{%])/g : /\s+({[{%]-)/g;
var rRight = options.trim_right ? /([}%]})\s+/g : /(-[}%]})\s+/g;
return html.replace(rLeft, '$1').replace(rRight, '$1');
}
exports.parse = parse;
exports.whiteSpaceCtrl = whiteSpaceCtrl;