From dfc557f9e63d2fbe87db7981855389063cf12363 Mon Sep 17 00:00:00 2001
From: Quincy Larson <michaelqlarson@gmail.com>
Date: Sun, 16 Aug 2015 13:49:43 -0700
Subject: [PATCH] move refactor all non-jquery JS to load last

---
 server/views/challengeMap/show.jade       |  1 +
 server/views/layout-wide.jade             |  2 +-
 server/views/layout.jade                  |  3 +-
 server/views/partials/css-cdns.jade       |  0
 server/views/partials/universal-head.jade | 65 +----------------------
 server/views/partials/universal-tail.jade | 53 ++++++++++++++++++
 6 files changed, 58 insertions(+), 66 deletions(-)
 delete mode 100644 server/views/partials/css-cdns.jade
 create mode 100644 server/views/partials/universal-tail.jade

diff --git a/server/views/challengeMap/show.jade b/server/views/challengeMap/show.jade
index f18ebe2f7e..6de79751dd 100644
--- a/server/views/challengeMap/show.jade
+++ b/server/views/challengeMap/show.jade
@@ -33,6 +33,7 @@ block content
                                     .col-xs-12.col-sm-9.col-md-10
                                         li.large-p.faded.negative-10
                                             a(href='#' + challengeBlock.dashedName)= challengeBlock.name
+                                        h3= challengeBlock
                                 else
                                     .hidden-xs.col-sm-3.col-md-2
                                         .progress.progress-bar-padding.text-center.thin-progress-bar
diff --git a/server/views/layout-wide.jade b/server/views/layout-wide.jade
index 9fb1390d5d..984337b870 100644
--- a/server/views/layout-wide.jade
+++ b/server/views/layout-wide.jade
@@ -3,8 +3,8 @@ html(ng-app='profileValidation', lang='en')
   head
     include partials/universal-head
   body.no-top-and-bottom-margins.full-screen-body-background
-    include partials/css-cdns
     include partials/navbar
     include partials/flash
     block content
     include partials/footer
+    include partials/universal-tail
diff --git a/server/views/layout.jade b/server/views/layout.jade
index 146b475a53..38057fcb1c 100644
--- a/server/views/layout.jade
+++ b/server/views/layout.jade
@@ -1,10 +1,11 @@
 doctype html
 html(ng-app='profileValidation', lang='en')
   head
-    include partials/universal-head
   body.top-and-bottom-margins
+    include partials/universal-head
     include partials/navbar
     .container
       include partials/flash
       block content
     include partials/footer
+    include partials/universal-tail
diff --git a/server/views/partials/css-cdns.jade b/server/views/partials/css-cdns.jade
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/server/views/partials/universal-head.jade b/server/views/partials/universal-head.jade
index c31b46da4c..5b4bced349 100644
--- a/server/views/partials/universal-head.jade
+++ b/server/views/partials/universal-head.jade
@@ -1,43 +1,3 @@
-script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
-script.
-    window.jQuery || document.write('<script src="/bower_components/jquery/dist/jquery.min.js"><\/script>');
-
-
-script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.js")
-script.
-    if (typeof window.angular === 'undefined') {
-        document.write('<script src="/bower_components/angular/angular.min.js"><\/script>')
-    }
-
-script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.13.0/ui-bootstrap.min.js")
-script.
-    try {
-        angular.module('ui.bootstrap');
-    } catch (e) {
-        document.write('<script src="/bower_components/angular-bootstrap/ui-bootstrap.min.js"><\/script>');
-    }
-
-script(src="//cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js")
-script.
-    window.d3 || document.write('<script src="/bower_components/d3/d3.js"><\/script>');
-
-script(src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js")
-script.
-    if (typeof($.fn.modal) === 'undefined') {
-        document.write('<script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"><\/script>');
-    }
-
-script(src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js")
-script.
-    window.moment || document.write('<script src="/bower_components/moment/min/moment.min.js"><\/script>');
-
-// Leave the below lines alone!
-script(src="/js/main_0.0.3.js")
-
-script(src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js")
-
-script(src="/bower_components/ramda/dist/ramda.min.js")
-
 link(rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato:400|Inconsolata")
 
 link(rel="stylesheet" type="text/css" href="/bower_components/cal-heatmap/cal-heatmap.css")
@@ -53,27 +13,4 @@ meta(charset='utf-8')
 meta(http-equiv='X-UA-Compatible', content='IE=edge')
 meta(name='viewport', content='width=device-width, initial-scale=1.0')
 meta(name='csrf-token', content=_csrf)
-script.
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-    ga('create', 'UA-55446531-1', 'auto');
-    ga('require', 'displayfeatures');
-    ga('send', 'pageview');
-script#inspectletjs(type='text/javascript').
-    window.__insp = window.__insp || [];
-    __insp.push(['wid', 561999918]);
-    (function() {
-        function __ldinsp() {
-            var insp = document.createElement('script');
-            insp.type = 'text/javascript';
-            insp.async = true;
-            insp.id = "inspsync";
-            insp.src = '//cdn.inspectlet.com/inspectlet.js';
-            var x = document.getElementsByTagName('script')[0];
-            x.parentNode.insertBefore(insp, x);
-        }
-        if (window.attachEvent) window.attachEvent('onload', __ldinsp);
-        else window.addEventListener('load', __ldinsp, false);
-    })();
+script(src="//ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js")
diff --git a/server/views/partials/universal-tail.jade b/server/views/partials/universal-tail.jade
new file mode 100644
index 0000000000..a3a4ec247b
--- /dev/null
+++ b/server/views/partials/universal-tail.jade
@@ -0,0 +1,53 @@
+script.
+    window.jQuery || document.write('<script src="/bower_components/jquery/dist/jquery.min.js"><\/script>');
+script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.11/angular.js")
+script.
+    if (typeof window.angular === 'undefined') {
+        document.write('<script src="/bower_components/angular/angular.min.js"><\/script>')
+    }
+script(src="//cdnjs.cloudflare.com/ajax/libs/angular-ui-bootstrap/0.13.0/ui-bootstrap.min.js")
+script.
+    try {
+        angular.module('ui.bootstrap');
+    } catch (e) {
+        document.write('<script src="/bower_components/angular-bootstrap/ui-bootstrap.min.js"><\/script>');
+    }
+script(src="//cdnjs.cloudflare.com/ajax/libs/d3/3.5.5/d3.min.js")
+script.
+    window.d3 || document.write('<script src="/bower_components/d3/d3.js"><\/script>');
+script(src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.4/js/bootstrap.min.js")
+script.
+    if (typeof($.fn.modal) === 'undefined') {
+        document.write('<script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"><\/script>');
+    }
+script(src="//cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.2/moment.min.js")
+script.
+    window.moment || document.write('<script src="/bower_components/moment/min/moment.min.js"><\/script>');
+// Leave the below lines alone!
+script(src="/js/main_0.0.3.js")
+script(src="/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js")
+script(src="/bower_components/ramda/dist/ramda.min.js")
+script.
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+    ga('create', 'UA-55446531-1', 'auto');
+    ga('require', 'displayfeatures');
+    ga('send', 'pageview');
+script#inspectletjs(type='text/javascript').
+    window.__insp = window.__insp || [];
+    __insp.push(['wid', 561999918]);
+    (function() {
+        function __ldinsp() {
+            var insp = document.createElement('script');
+            insp.type = 'text/javascript';
+            insp.async = true;
+            insp.id = "inspsync";
+            insp.src = '//cdn.inspectlet.com/inspectlet.js';
+            var x = document.getElementsByTagName('script')[0];
+            x.parentNode.insertBefore(insp, x);
+        }
+        if (window.attachEvent) window.attachEvent('onload', __ldinsp);
+        else window.addEventListener('load', __ldinsp, false);
+    })();