Changed template engine variable name to allow direct output from hel…

…per functions.
cskr · Aug 25, 2010 · f37b017 · f37b017
1 parent 62f5989
commit f37b017
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -102,8 +102,3 @@ Hashes containing the necessary dependencies can be added to the `this` context
     });
 
     gh.serve(8080);
-
-To Do
------
-
-* Improve template engine to allow callbacks in helpers.
diff --git a/grasshopper/lib/ghp.js b/grasshopper/lib/ghp.js
@@ -37,7 +37,7 @@ exports.addHelpers = function(newHelpers) {
 }
 
 function compile(text, helpersCount) {
-    var funcBody = "var p=[], model = model || {};";
+    var funcBody = "var _out = [], model = model || {};";
 
     for(var i = 0; i < helpersCount; i++) {
         funcBody += "with(helpers[" + i + "]) {";
@@ -47,18 +47,18 @@ function compile(text, helpersCount) {
     var parts = text.split("<%");
     parts.forEach(function(part) {
         if(part.indexOf("%>") == -1) {
-            funcBody += "p.push('" + escapeCode(part) + "');";
+            funcBody += "_out.push('" + escapeCode(part) + "');";
         } else if(part.charAt(0) == '=') {
             var subParts = part.split('%>');
-            funcBody += "p.push(" + subParts[0].substring(1) + ");";
+            funcBody += "_out.push(" + subParts[0].substring(1) + ");";
             if(subParts.length > 1) {
-                funcBody += "p.push('" + escapeCode(subParts[1]) + "');";
+                funcBody += "_out.push('" + escapeCode(subParts[1]) + "');";
             }
         } else {
             var subParts = part.split('%>');
             funcBody += subParts[0];
             if(subParts.length > 1) {
-                funcBody += "p.push('" + escapeCode(subParts[1]) + "');";
+                funcBody += "_out.push('" + escapeCode(subParts[1]) + "');";
             }
         }
     });
@@ -70,7 +70,7 @@ function compile(text, helpersCount) {
         funcBody += "}";
     }
 
-    funcBody += "return p.join('');"
+    funcBody += "return _out.join('');"
     return new Function("model", "helpers", funcBody);
 }
 

diff --git a/grasshopper/lib/grasshopper.js b/grasshopper/lib/grasshopper.js
@@ -21,6 +21,7 @@ var http = require('http'),
     multipart = require('./multipart'),
     session = require('./session'),
     model = require('./model'),
+    ghp = require('./ghp'),
     i18n = require('./i18n');
 
 process.on('uncaughtException', function(err) {
@@ -50,6 +51,8 @@ exports.addFilters = function(regex) {
     filters.push({pattern: regex, filters: filtersArray}); 
 }
 
+exports.addHelpers = ghp.addHelpers;
+
 exports.configure = function(config) {
     renderer.configure(config);
     multipart.configure(config);