Updating the main API to support rendering a completed template from …

…a template engine during the pre-Render call
ifandelse · Oct 28, 2011 · e212f84 · e212f84
1 parent 0f437a2
commit e212f84
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/examples/shorthand/main.js b/examples/shorthand/main.js
@@ -31,8 +31,11 @@ $(function(){
             "Example",
             $("#targetFancy"),
             {
-                preRender: function(target) { $(target).children().remove().end().fadeOut().hide(); },
-                render:    function(target, template) { $(target).append($.tmpl(template, model)).slideDown('slow'); },
+                preRender: function(target, template, setTemplate) {
+                                $(target).children().remove().end().fadeOut().hide();
+                                setTemplate($.tmpl(template, model));
+                           },
+                render:    function(target, template) { $(target).append(template).slideDown('slow'); },
                 postRender: toggleFancy
             }
         );

diff --git a/examples/trafficcop/index.html b/examples/trafficcop/index.html
@@ -2,7 +2,7 @@
         "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-    <title>jQuery-tmpl Example</title>
+    <title>Traffic Cop Example</title>
     <script type="text/javascript" src="../../ext/jquery-1.5.2.js"></script>
     <script type="text/javascript" src="../../lib/infuser.js"></script>
     <script type="text/javascript" src="jquery.tmpl.js"></script>

diff --git a/examples/trafficcop/main.js b/examples/trafficcop/main.js
@@ -4,8 +4,11 @@ var toggled = false,
             "Example",
             $("#target"),
             {
-                render:    function(target, template) {
-                    $(target).append($.tmpl(template, menus[modelNum])).slideDown('slow');
+                preRender: function(target, template, setTemplate) {
+                    setTemplate($.tmpl(template, menus[modelNum]));
+                },
+                render: function(target, template) {
+                    $(target).append(template).slideDown('slow');
                 }
             }
         );

diff --git a/lib/infuser.js b/lib/infuser.js
@@ -190,8 +190,9 @@ var infuser = {
     infuse: function(templateId, targetDomElement, renderOptions) {
         var options = $.extend({}, defaultRenderOptions, renderOptions);
         this.get(templateId, function(template) {
-            options.preRender(targetDomElement);
-            options.render(targetDomElement, template);
+            var _template = template;
+            options.preRender(targetDomElement, _template, function(renderedTemplate) { _template = renderedTemplate; });
+            options.render(targetDomElement, _template);
             options.postRender(targetDomElement);
         });
     }

diff --git a/lib/infuser.min.gz.js b/lib/infuser.min.gz.js
diff --git a/lib/infuser.min.js b/lib/infuser.min.js
diff --git a/src/Api.js b/src/Api.js
@@ -70,8 +70,9 @@ var infuser = {
     infuse: function(templateId, targetDomElement, renderOptions) {
         var options = $.extend({}, defaultRenderOptions, renderOptions);
         this.get(templateId, function(template) {
-            options.preRender(targetDomElement);
-            options.render(targetDomElement, template);
+            var _template = template;
+            options.preRender(targetDomElement, _template, function(renderedTemplate) { _template = renderedTemplate; });
+            options.render(targetDomElement, _template);
             options.postRender(targetDomElement);
         });
     }