From dd5a8e8a88ca2f6c05abb8c3b481b69d7a11eba8 Mon Sep 17 00:00:00 2001 From: barisusakli Date: Fri, 11 Sep 2015 20:36:31 -0400 Subject: [PATCH] closes #3568 --- public/src/variables.js | 1 + src/middleware/middleware.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/src/variables.js b/public/src/variables.js index 52674df429..6b443caa5d 100644 --- a/public/src/variables.js +++ b/public/src/variables.js @@ -9,6 +9,7 @@ var dataEl = $('#content [ajaxify-data]'); if (dataEl.length) { ajaxify.data = JSON.parse(decodeURIComponent(dataEl.attr('ajaxify-data'))); + dataEl.remove(); } }; }(ajaxify || {})); diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js index cc77ccd8db..c381acea20 100644 --- a/src/middleware/middleware.js +++ b/src/middleware/middleware.js @@ -320,7 +320,6 @@ middleware.processRender = function(req, res, next) { self.send(str); }; - options = options || {}; if ('function' === typeof options) { @@ -346,13 +345,14 @@ middleware.processRender = function(req, res, next) { return res.json(options); } + var ajaxifyData = encodeURIComponent(JSON.stringify(options)); render.call(self, template, options, function(err, str) { if (err) { winston.error(err); return fn(err); } - str = str + ''; + str = str + ''; str = (res.locals.postHeader ? res.locals.postHeader : '') + str + (res.locals.preFooter ? res.locals.preFooter : ''); if (res.locals.footer) {