Skip to content

Commit

Permalink
Merge pull request #6 from pmgodin/master
Browse files Browse the repository at this point in the history
Just made another vars related modification to tag "render"
  • Loading branch information
Mathieu Sylvain committed Apr 2, 2012
2 parents def9ee7 + a4fd236 commit 92b1038
Showing 1 changed file with 17 additions and 3 deletions.
20 changes: 17 additions & 3 deletions lib/dali.js
Original file line number Diff line number Diff line change
Expand Up @@ -916,6 +916,15 @@ var global = (typeof (window) === "object") ? window : this;
"lowercase": function (stream, args) {
return (stream).toLowerCase();
},
"currency": function (stream, args) {
var curr = parseFloat((stream));
if(typeof curr=='number'){
curr = curr.toString().replace(".",",");
}else{
curr = "NaN";
}
return curr;
},
"log": function (stream, args) {
if (console !== undefined) {
console.info(stream);
Expand Down Expand Up @@ -1200,22 +1209,27 @@ var global = (typeof (window) === "object") ? window : this;
"var": []
});
varBlocks = altBlocksObj["var"];
// todo: by PM, Verify if this line is OK
/* PM WAS HERE I assume this is temporary, but we clear env.vars for each render */ var localvars = {};

for (i in varBlocks) {
if (varBlocks.hasOwnProperty(i)) {
varBlock = varBlocks[i];
blockArgs = evaluateExpressions(varBlock.args);
varName = blockArgs[0][0];
env.flush();
varBlock.handler.apply([{}], [env, args]);
env.vars[varName] = env.stream();
// env.vars[varName] = env.stream();
/* PM WAS HERE */ localvars[varName] = env.stream();

}
}
if (block) {
env.flush();
block.apply([data], [env, args]);
}
env.vars._output = env.stream();
// env.vars._output = env.stream();
/* PM WAS HERE */ localvars._output = env.stream();

//todo: first try to find the template in the local store
// otherwise, try to parse a partial
Expand All @@ -1231,7 +1245,7 @@ var global = (typeof (window) === "object") ? window : this;

// todo: by PM, Verify if this line is OK
// the purpose is not to loose the _output variable from the reuse in templates
/* PM WAS HERE */partialData.vars = clone(env.vars);
/* PM WAS HERE */ partialData.vars = localvars;
output = Dali.partial(args[0], partialData); // todo: pass vars
} else {
output = env.render(args[0], args[1], env.vars);
Expand Down

0 comments on commit 92b1038

Please sign in to comment.