ferrugemjs-node
Advanced tools
Comparing version 0.27.2 to 0.27.3
{ | ||
"name": "ferrugemjs-node", | ||
"version": "0.27.2", | ||
"version": "0.27.3", | ||
"description": "a node package to convert html template to Incremental DOM", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -248,18 +248,23 @@ var htmlparser = require("htmlparser2"); | ||
if(text && text.trim()){ | ||
if(text.indexOf('${') === -1){ | ||
var strTmp = text; | ||
var strBlankLineReplace = "-x-abc"+new Date().getTime()+"zxv-x-" ; | ||
strTmp = strTmp | ||
.replace(/\s/g,strBlankLineReplace) | ||
.trim() | ||
.replace(/\n/g,' ') | ||
.replace(/\t/g,'') | ||
.replace(new RegExp(strBlankLineReplace,'g')," "); | ||
if(strTmp.indexOf('${') === -1){ | ||
// have'nt interpolation | ||
return '\t\n_idom.text("'+text+'");\t\n'; | ||
return '\t\n_idom.text("'+strTmp+'");\t\n'; | ||
} | ||
var strTmp = text.replace(/([^$])((\{)(.+?)(\}))/g, '$1#beg-brackets#$4#end-brackets#'); | ||
var txtReplace = "-x-abc"+new Date().getTime()+"zxv-x-" ; | ||
//var regexReplace = new RegExp(txtReplace,'g'); | ||
var strFormated = strTmp.replace(/\s/g,txtReplace).trim().replace(/\n/g,' ').replace(/\$\{([^}]*)\}/g,function($1,$2){ | ||
return '"+('+contextToAlias($2)+')+"'; | ||
}); | ||
strFormated = strFormated.replace(/\t/g,'').replace(new RegExp(txtReplace,'g')," "); | ||
strFormated = strFormated.replace(/#beg-brackets#/g,'{').replace(/#end-brackets#/g,'}'); | ||
var formated = '\t\n_idom.text("'+strFormated+'");\t\n'; | ||
return formated; | ||
strTmp = strTmp | ||
.replace(/([^$])((\{)(.+?)(\}))/g, '$1#beg-brackets#$4#end-brackets#') | ||
.replace(/\$\{([^}]*)\}/g,function($1,$2){ | ||
return '"+('+contextToAlias($2)+')+"'; | ||
}) | ||
.replace(/#beg-brackets#/g,'{').replace(/#end-brackets#/g,'}'); | ||
return '\t\n_idom.text("'+strTmp+'");\t\n'; | ||
} | ||
@@ -266,0 +271,0 @@ return ""; |
753
30280