From d5f3f3d9fbbbd546a2b1d9b4b72eeca40ab21c0c Mon Sep 17 00:00:00 2001 From: psychobunny <psycho.bunny@hotmail.com> Date: Tue, 11 Jun 2013 14:52:21 -0400 Subject: [PATCH] fixed serverside templates.js bug that prevented blocks from being defined --- public/src/templates.js | 2 +- src/webserver.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/src/templates.js b/public/src/templates.js index 4a39277c2b..4151d8f823 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -210,7 +210,7 @@ data = template.match(regex); if (data == null) return; - if (block !== undefined) self.blocks[block] = data[0]; + if (self.blocks && block !== undefined) self.blocks[block] = data[0]; data = data[0] .replace("<!-- BEGIN " + block + " -->", "") diff --git a/src/webserver.js b/src/webserver.js index 8ba6590594..ec03efe542 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -118,7 +118,7 @@ var express = require('express'), console.log(posts); res.send( build_header() + - '\n\t<noscript>\n\t\t' + templates['noscript/topic'].parse(/*{ posts: [{ foo: 'bar' }]}*/) + '\n\t</noscript>' + + '\n\t<noscript>\n\t\t' + templates['noscript/topic'].parse({ posts: posts }) + '\n\t</noscript>' + '\n\t<script>templates.ready(function(){ajaxify.go("topic/' + topic_url + '");});</script>' + templates['footer'] );