Added page variable so random word code only runs on main page

ft-interactive · Dec 14, 2015 · 207c289 · 207c289 · sumeetadur · Dec 14, 2015
1 parent 19d57ea
commit 207c289
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/client/definition-page.hbs b/client/definition-page.hbs
@@ -8,6 +8,7 @@
      		<a href="form/" class="o-buttons o-buttons--standout">Suggest your own entry</a>
      	</div>
 
+     	{{#with word}}
 		<div class="detailed-guff">
 			<div class="word">{{word}}</div>
 			<div class="details">
@@ -58,5 +59,6 @@
 				<a href="{{nextWord.slug}}/" class="next-guff">Next&raquo;<br><span class="preview">{{nextWord.word}}</span></a>
 			{{/if}}
 		</div>
+		{{/with}}
 	</main>
 {{> bottom }}
diff --git a/client/main-page.hbs b/client/main-page.hbs
@@ -17,7 +17,7 @@
 
 		{{#each homewords}}
 			<div class="{{#if @first}}latest{{else}}random{{/if}}-guff">
-				<div class="paraHeads">{{#if @first}}<span class="label">Latest guff</span><span class="timestamp">added on {{formatteddate}}</span>{{else}}<span class="label">Random guff</span><span class="refresh"></span>{{/if}}</div>
+				<div class="paraHeads">{{#if @first}}<span class="label">Latest guff</span><span class="timestamp">added on {{formatteddate}}</span>{{else}}<span class="label">Random guff</span>{{/if}}</div>
 				<a class="word" href="{{@key}}/">{{word}}&raquo;</a>
 				<div class="details">
 					{{#if definition}}

diff --git a/client/scripts/main.js b/client/scripts/main.js
@@ -10,7 +10,7 @@ document.addEventListener('DOMContentLoaded', () => {
   // remove the 300ms tap delay on mobile browsers
   attachFastClick(document.body);
 
-  if (document.documentElement.className === 'enhanced') {
+  if (page === 'main' && document.documentElement.className === 'enhanced') {
     let xmlhttp = new XMLHttpRequest();
     xmlhttp.onreadystatechange = function () {
       if (xmlhttp.readyState === 4 && xmlhttp.status === 200) {

diff --git a/client/top.hbs b/client/top.hbs
@@ -9,10 +9,10 @@
     <link rel="shortcut icon" href="https://ig.ft.com/favicon.ico" type="image/x-icon">
     <link rel="apple-touch-icon" href="//im.ft-static.com/m/icons/apple-touch-icon.png">
 
-    {{#if word}}<base href="../" />{{/if}}
-
-    <title>{{#if word}}{{word}} - {{/if}}Lucy Kellaway's Dictionary of Business Jargon and Guff</title>
-    <!-- <meta name="description" content="ENTER A DESCRIPTION HERE"> -->
+    {{#with word}}
+        {{#if word}}<base href="../" />{{/if}}
+        <title>{{#if word}}{{word}} - {{/if}}Lucy Kellaway's Dictionary of Business Jargon and Guff</title>
+    {{/with}}
 
     <!-- smoosh -->
     <script src="scripts/top.js"></script>
@@ -43,6 +43,7 @@
     <img alt="" border="0" width="1" height="1" src="http://track.ft.com/track/track.js?javascript=disabled"/>
     <img alt="" border="0" width="1" height="1" src="http://stats.ft.com/si/track.gif?WT.js=No"/>
     </noscript>
+    <script>const page = '{{page}}';</script>
     <header class="site-header">
       <a href="http://www.ft.com/">
         <img class="masthead" src="https://image.webservices.ft.com/v1/images/raw/fticon:brand-ft-masthead?source=ft-interactive">

diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -354,7 +354,11 @@ gulp.task('templates', () => {
 
   for (const slug of Object.keys(words)) {
     const word = words[slug];
-    const definitionPageHtml = definitionPageTemplate(word);
+    const definitionPageHtml = definitionPageTemplate({
+      trackingEnv: (env === 'production' ? 'p' : 't'),
+      page: "definition",
+      word
+    });
 
     mkdirp.sync(`.tmp/${slug}`);
     fs.writeFileSync(`.tmp/${slug}/index.html`, definitionPageHtml);
@@ -365,11 +369,16 @@ gulp.task('templates', () => {
   const mainPageTemplate = Handlebars.compile(fs.readFileSync('client/main-page.hbs', 'utf8'));
   const mainPageHtml = mainPageTemplate({
     trackingEnv: (env === 'production' ? 'p' : 't'),
+    page: "main",
     homewords,
     words,
   });
   fs.writeFileSync(`.tmp/index.html`, mainPageHtml);
 
   const thanksPageTemplate = Handlebars.compile(fs.readFileSync('client/thanks-page.hbs', 'utf8'));
-  fs.writeFileSync(`.tmp/thanks.html`, thanksPageTemplate());
+  const thanksPageHtml = thanksPageTemplate({
+    trackingEnv: (env === 'production' ? 'p' : 't'),
+    page: "thanks"
+  })
+  fs.writeFileSync(`.tmp/thanks.html`, thanksPageHtml);
 });