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

do not trim output tags and previous \n, #19

Browse Source
This commit is contained in:
harttle
2017-01-31 23:15:23 +08:00
parent 0c8148c12b
commit 21eefe1d7b
4 changed files with 27 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tokenizer.js
+5 -9
View File
@@ -9,7 +9,7 @@ function parse(html, filepath, options) {
html = whiteSpaceCtrl(html, options);
var tokens = [];
var syntax = /({%-?(.*?)-?%})|({{-?(.*?)-?}})/g;
var syntax = /({%-?(.*?)-?%})|({{(.*?)}})/g;
var result, htmlFragment, token;
var lastMatchEnd = 0, lastMatchBegin = -1, parsedLinesCount = 0;
@@ -78,17 +78,13 @@ function parse(html, filepath, options) {
function whiteSpaceCtrl(html, options){
options = options || {};
if(options.trim_left) {
html = html
.replace(/{{-?/g, '{{-')
.replace(/{%-?/g, '{%-');
html = html.replace(/{%-?/g, '{%-');
}
if(options.trim_right) {
html = html
.replace(/-?}}/g, '-}}')
.replace(/-?%}/g, '-%}');
html = html.replace(/-?%}/g, '-%}');
}
var rLeft = options.greedy ? /\s+({[{%]-)/g : /\n[\t\r ]*({[{%]-)/g;
var rRight = options.greedy ? /(-[}%]})\s+/g : /(-[}%]})[\t\r ]*\n/g;
var rLeft = options.greedy ? /\s+({%-)/g : /[\t\r ]*({%-)/g;
var rRight = options.greedy ? /(-%})\s+/g : /(-%})[\t\r ]*\n?/g;
return html.replace(rLeft, '$1').replace(rRight, '$1');
}