From 85a7be01cb8fd74cc49dea71744fb2923b89409e Mon Sep 17 00:00:00 2001 From: Danny Coates Date: Wed, 19 Jul 2017 14:00:10 -0700 Subject: [PATCH] add a dynamic js script for page config --- server/server.js | 10 ++++++++-- views/jsconfig.handlebars | 6 ++++++ views/layouts/main.handlebars | 7 +------ views/partials/analytics.handlebars | 17 ----------------- views/partials/sentry.handlebars | 3 --- 5 files changed, 15 insertions(+), 28 deletions(-) create mode 100644 views/jsconfig.handlebars delete mode 100644 views/partials/analytics.handlebars delete mode 100644 views/partials/sentry.handlebars diff --git a/server/server.js b/server/server.js index a0951e51..24e1d418 100644 --- 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 new file mode 100644 index 00000000..1e960e83 --- /dev/null +++ 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 index d3a660ba..285ad3c7 100644 --- a/views/layouts/main.handlebars +++ b/views/layouts/main.handlebars @@ -2,15 +2,10 @@ Firefox Send - {{#if dsn}} - {{> sentry dsn=dsn}} - {{/if}} + - {{#if trackerId}} - {{> analytics trackerId=trackerId}} - {{/if}} diff --git a/views/partials/analytics.handlebars b/views/partials/analytics.handlebars deleted file mode 100644 index 3f7babc8..00000000 --- a/views/partials/analytics.handlebars +++ /dev/null @@ -1,17 +0,0 @@ - \ No newline at end of file diff --git a/views/partials/sentry.handlebars b/views/partials/sentry.handlebars deleted file mode 100644 index 1ba12f42..00000000 --- a/views/partials/sentry.handlebars +++ /dev/null @@ -1,3 +0,0 @@ - \ No newline at end of file