Merge pull request #257 from mozilla/jsconfig

add a dynamic js script for page config
mozilla · Jul 19, 2017 · 3bb6a6f · 3bb6a6f
2 parents 64e7182 + 85a7be0
commit 3bb6a6f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 28 deletions.
diff --git a/server/server.js b/server/server.js
@@ -69,9 +69,15 @@ app.use('/l20n', express.static(L20N));
 app.use('/locales', express.static(LOCALES));
 
 app.get('/', (req, res) => {
-  res.render('index', {
+  res.render('index');
+});
+
+app.get('/jsconfig.js', (req, res) => {
+  res.set('Content-Type', 'application/javascript');
+  res.render('jsconfig', {
     trackerId: conf.analytics_id,
-    dsn: conf.sentry_id
+    dsn: conf.sentry_id,
+    layout: false
   });
 });
 

diff --git a/views/jsconfig.handlebars b/views/jsconfig.handlebars
@@ -0,0 +1,6 @@
+{{#if dsn}}
+window.dsn = '{{{dsn}}}';
+{{/if}}
+{{#if trackerId}}
+window.trackerId = '{{{trackerId}}}';
+{{/if}}
diff --git a/views/layouts/main.handlebars b/views/layouts/main.handlebars
@@ -2,15 +2,10 @@
 <html>
 <head>
   <title>Firefox Send</title>
-  {{#if dsn}}
-  {{> sentry dsn=dsn}}
-  {{/if}}
+  <script src="/jsconfig.js"></script>
   <script src="/bundle.js"></script>
   <link rel="stylesheet" type="text/css" href="/main.css" />
   <link rel="stylesheet" href="https://code.cdn.mozilla.net/fonts/fira.css">
-  {{#if trackerId}}
-  {{> analytics trackerId=trackerId}}
-  {{/if}}
 
   <meta name="defaultLanguage" content="en-US">
   <meta name="availableLanguages" content="en-US">

diff --git a/views/partials/analytics.handlebars b/views/partials/analytics.handlebars
diff --git a/views/partials/sentry.handlebars b/views/partials/sentry.handlebars