From 0fa555dbb181ad3b79af4086d208f76ac60bf529 Mon Sep 17 00:00:00 2001 From: Zoltan Olah Date: Fri, 17 Jul 2015 17:49:50 -0700 Subject: [PATCH] Updates code to use dynamicHead/Body --- packages/boilerplate-generator/boilerplate_web.browser.html | 2 ++ packages/webapp/webapp_server.js | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/boilerplate-generator/boilerplate_web.browser.html b/packages/boilerplate-generator/boilerplate_web.browser.html index 3871c81e6e..e3a30964b1 100644 --- a/packages/boilerplate-generator/boilerplate_web.browser.html +++ b/packages/boilerplate-generator/boilerplate_web.browser.html @@ -21,8 +21,10 @@ {{/each}} {{{head}}} +{{{dynamicHead}}} {{{body}}} +{{{dynamicBody}}} diff --git a/packages/webapp/webapp_server.js b/packages/webapp/webapp_server.js index f53d4b3dc4..fcbf404517 100644 --- a/packages/webapp/webapp_server.js +++ b/packages/webapp/webapp_server.js @@ -109,7 +109,7 @@ WebApp.categorizeRequest = function (req) { return _.extend({ browser: identifyBrowser(req.headers['user-agent']), url: url.parse(req.url, true) - }, _.pick(req, 'head', 'body')); + }, _.pick(req, 'dynamicHead', 'dynamicBody')); }; // HTML attribute hooks: functions to be called to determine any attributes to @@ -244,7 +244,7 @@ var boilerplateByArch = {}; // XXX so far this function is always called with arch === 'web.browser' var memoizedBoilerplate = {}; var getBoilerplate = function (request, arch) { - var useMemoized = ! (request.head || request.body); + var useMemoized = ! (request.dynamicHead || request.dynamicBody); var htmlAttributes = getHtmlAttributes(request); if (useMemoized) { @@ -268,7 +268,7 @@ var getBoilerplate = function (request, arch) { var boilerplateOptions = _.extend({ htmlAttributes: htmlAttributes - }, _.pick(request, 'head', 'body')); + }, _.pick(request, 'dynamicHead', 'dynamicBody')); return boilerplateByArch[arch].toHTML(boilerplateOptions); };