From b9ecfcf41facb1e92da73aa46732e624349d52d1 Mon Sep 17 00:00:00 2001
From: Brian Gough <bjg@network-theory.co.uk>
Date: Tue, 11 Oct 2016 13:02:30 +0100
Subject: [PATCH 1/2] provide minimal requirejs config

---
 services/web/app/views/layout.jade | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade
index 07fe638b29..25783d130e 100644
--- a/services/web/app/views/layout.jade
+++ b/services/web/app/views/layout.jade
@@ -109,6 +109,19 @@ html(itemscope, itemtype='http://schema.org/Product')
 		- if(typeof(suppressNavbar) == "undefined")
 			include layout/navbar
 
+		script(type='text/javascript').
+			// minimal requirejs configuration (can be extended/overridden)
+			window.requirejs = {
+				"paths" : {
+					"moment": "libs/#{lib('moment')}"
+				},
+				"config":{
+					"moment":{
+						"noGlobal": true
+					}
+				}
+			};
+
 		block content
 		div(ng-controller="AbTestController")
 		- if(typeof(suppressFooter) == "undefined")
@@ -123,17 +136,8 @@ html(itemscope, itemtype='http://schema.org/Product')
 
 		- if(typeof(suppressFooter) == "undefined")
 			script(type='text/javascript').
-				window.requirejs = {
-					"urlArgs" : "fingerprint=#{fingerprint(jsPath + 'main.js')}-#{fingerprint(jsPath + 'libs.js')}",
-					"paths" : {
-						"moment": "libs/#{lib('moment')}"
-					},
-					"config":{
-						"moment":{
-							"noGlobal": true
-						}
-					}
-				};
+				// extend requirejs config
+				window.requirejs.urlArgs = "fingerprint=#{fingerprint(jsPath + 'main.js')}-#{fingerprint(jsPath + 'libs.js')}"
 			script(
 				data-main=buildJsPath('main.js', {fingerprint:false}),
 				baseurl=fullJsPath,

From 0f2959eb3b0c835e388b7d7a42e75dbf8c5ed403 Mon Sep 17 00:00:00 2001
From: Brian Gough <bjg@network-theory.co.uk>
Date: Tue, 11 Oct 2016 13:02:48 +0100
Subject: [PATCH 2/2] use suppressDefaultJs instead of suppressFooter

---
 services/web/app/views/layout.jade                             | 3 +--
 services/web/app/views/subscriptions/edit-billing-details.jade | 2 +-
 services/web/app/views/subscriptions/new.jade                  | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade
index 25783d130e..4d16b98c29 100644
--- a/services/web/app/views/layout.jade
+++ b/services/web/app/views/layout.jade
@@ -133,8 +133,7 @@ html(itemscope, itemtype='http://schema.org/Product')
 			span(ng-controller="ScribtexPopupController")
 			include scribtex-modal
 
-
-		- if(typeof(suppressFooter) == "undefined")
+		- if(typeof(suppressDefaultJs) == "undefined")
 			script(type='text/javascript').
 				// extend requirejs config
 				window.requirejs.urlArgs = "fingerprint=#{fingerprint(jsPath + 'main.js')}-#{fingerprint(jsPath + 'libs.js')}"
diff --git a/services/web/app/views/subscriptions/edit-billing-details.jade b/services/web/app/views/subscriptions/edit-billing-details.jade
index 0e3ffc442f..6c13985cfe 100644
--- a/services/web/app/views/subscriptions/edit-billing-details.jade
+++ b/services/web/app/views/subscriptions/edit-billing-details.jade
@@ -1,7 +1,7 @@
 extends ../layout
 
 block content
-	- locals.supressDefaultJs = true
+	- locals.suppressDefaultJs = true
 	script(data-main=jsPath+'main.js', src=jsPath+'libs/require.js', baseurl=jsPath)
 	script(src=buildJsPath('libs/recurly.min.js', {fingerprint:false}))
 
diff --git a/services/web/app/views/subscriptions/new.jade b/services/web/app/views/subscriptions/new.jade
index 31c8205e7c..691efdf7f6 100644
--- a/services/web/app/views/subscriptions/new.jade
+++ b/services/web/app/views/subscriptions/new.jade
@@ -11,7 +11,7 @@ block scripts
 		window.couponCode = "#{couponCode}"
 
 block content
-	- locals.supressDefaultJs = true
+	- locals.suppressDefaultJs = true
 	script(data-main=jsPath+'main.js', src=jsPath+'libs/require.js', baseurl=jsPath)