archive-gh-me/marko
1
0
Fork 0
mirror of https://github.com/marko-js/marko.git synced 2025-12-08 19:26:05 +00:00
Code Issues Projects Releases Wiki Activity

When compiling templates that use string concatenation, treat null and undefined as empty strings so that the the literal "null" and "undefined" don't get written

Browse Source
This commit is contained in:
Phil Gates-Idem 2014-08-13 00:37:18 -04:00
parent 8a25b7eab9
commit a49554b4cb
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
compiler/TemplateBuilder.js
View File

@ -250,9 +250,12 @@ function TemplateBuilder(compiler, path, rootNode) {
this.helperFunctionsAdded = {};
this.vars = [];
this.varsLookup = {};
this.getStaticHelperFunction('toString', 's');
this.getStaticHelperFunction('empty', 'e');
this.getStaticHelperFunction('notEmpty', 'ne');
}
TemplateBuilder.prototype = {
captureCode: function (func, thisObj) {
@ -282,8 +285,8 @@ TemplateBuilder.prototype = {
},
addStaticVar: function (name, expression) {
name = safeVarName(name);
if (!this.staticVarsLookup[name]) {
if (!this.staticVarsLookup.hasOwnProperty(name)) {
this.staticVarsLookup[name] = true;
this.staticVars.push({
name: name,

14
compiler/expression-parser.js
View File

@ -118,7 +118,7 @@ function getConditionalExpression(expression) {
} else if (matches[0] === '\\\\;') {
/*
* 1) Convert \\; --> \;
* 2) Start searching again after the single slash
* 2) Start searching again after the single slash
*/
expression = expression.substring(0, matches.index) + '\\;' + expression.substring(tokensRegExp.lastIndex);
tokensRegExp.lastIndex = matches.index + 1;
@ -126,7 +126,7 @@ function getConditionalExpression(expression) {
} else if (matches[0] === '\\;') {
/*
* 1) Convert \; --> ;
* 2) Start searching again after the semicolon
* 2) Start searching again after the semicolon
*/
expression = expression.substring(0, matches.index) + ';' + expression.substring(tokensRegExp.lastIndex);
tokensRegExp.lastIndex = matches.index + 1;
@ -238,7 +238,7 @@ ExpressionParserHelper.prototype = {
// We don't need to surround with parentheses if
// the expression will be escaped since the expression
// is an argument to a function call
expression = '(' + expression + ')';
expression = 'toString(' + expression + ')';
}
expression = new Expression(expression);
}
@ -253,7 +253,7 @@ ExpressionParserHelper.prototype = {
/**
* @memberOf raptor/templating/compiler$ExpressionParser
*
*
* @param str
* @param callback
* @param thisObj
@ -295,7 +295,7 @@ parse = function (str, listeners, options) {
// \\${
/*
* We found a double-escaped start token.
*
*
* We found a start token that is preceeded by an escaped backslash...
* The start token is a valid start token preceded by an escaped
* backslash. Add a single black slash and handle the expression
@ -320,7 +320,7 @@ parse = function (str, listeners, options) {
continue;
} else if (endingTokens.hasOwnProperty(startMatches[0])) {
/*
* We found a valid start token
* We found a valid start token
*/
startToken = startMatches[0];
//Record the start token
@ -352,7 +352,7 @@ parse = function (str, listeners, options) {
if (startToken === '$!') {
helper.addUnescapedExpression(varName); //Add the variable as an expression
} else {
helper.addExpression(varName); //Add the variable as an expression
helper.addExpression(varName); //Add the variable as an expression
}
startRegExp.lastIndex = textStart = expressionStart = expressionStart + varName.length;
continue outer;

4
runtime/helpers.js
View File

@ -14,6 +14,10 @@ function notEmpty(o) {
}
module.exports = {
s: function(str) {
return (str == null) ? '' : str;
},
fv: function (array, callback) {
if (!array) {
return;