From 3c52d87c726876264ca4e31709df5027ca1094c6 Mon Sep 17 00:00:00 2001
From: Martii <thalamew@q.com>
Date: Wed, 29 Jul 2015 17:06:07 -0600
Subject: [PATCH] Post fixes for #339 commits

* Scoot ga script to script folder
* Don't inject/run on dev
* Missing semi-colon
* Missing IIFE trailing function call invocation... e.g. code with key isn't called
* Use strict XHTML syntax for `sync` attribute
* Shifted html to the left... mentioned before with @jerone ... most ppl don't use view source anymore and a debugger doesn't need this... plus saves a bit of storage space and transfer size

Closes #339
---
 views/includes/footer.html                  | 18 ++-------
 views/includes/head.html                    | 42 +++++++++++----------
 views/includes/scripts/googleAnalytics.html | 16 ++++++++
 3 files changed, 42 insertions(+), 34 deletions(-)
 create mode 100644 views/includes/scripts/googleAnalytics.html

diff --git a/views/includes/footer.html b/views/includes/footer.html
index 4a180c4c2..3b6d1a57e 100644
--- a/views/includes/footer.html
+++ b/views/includes/footer.html
@@ -22,20 +22,10 @@
 <!-- JS -->
 <script type="text/javascript" charset="UTF-8" src="/redist/npm/jquery/dist/jquery.js"></script>
 <script type="text/javascript" charset="UTF-8" src="/redist/npm/bootstrap/dist/js/bootstrap.js"></script>
-<script type="text/javascript">
-// Google Analytics Code
-(function () {
-    var win = window;
-    win['GoogleAnalyticsObject'] = 'ga';
-    win['ga'] = win['ga'] || function () {
-        (win['ga'].q = win['ga'].q || []).push(arguments);
-    }
-        
-    win['ga'].l = 1 * new Date();
 
-    ga('create', 'UA-59965387-1', 'auto');
-    ga('send', 'pageview')
-})
-</script>
 {{> includes/scripts/hideReminders.html }}
 
+{{^isDev}}
+<!-- Google Analytics -->
+{{> includes/scripts/googleAnalytics.html }}
+{{/isDev}}
diff --git a/views/includes/head.html b/views/includes/head.html
index 069672ff7..acc4b3191 100644
--- a/views/includes/head.html
+++ b/views/includes/head.html
@@ -1,22 +1,24 @@
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  {{#pageMetaDescription}}<meta name="description" content="{{pageMetaDescription}}">{{/pageMetaDescription}}
-  {{#pageMetaKeywords}}<meta name="keywords" content="{{pageMetaKeywords}}">{{/pageMetaKeywords}}
-  <link rel="shortcut icon" href="/images/favicon.ico" >
+<meta charset="UTF-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+{{#pageMetaDescription}}<meta name="description" content="{{pageMetaDescription}}">{{/pageMetaDescription}}
+{{#pageMetaKeywords}}<meta name="keywords" content="{{pageMetaKeywords}}">{{/pageMetaKeywords}}
+<link rel="shortcut icon" href="/images/favicon.ico" >
 
-  <!-- Open Search -->
-  <link href="/xml/opensearch-groups.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Groups">
-  <link href="/xml/opensearch-libraries.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Libraries">
-  <link href="/xml/opensearch-scripts.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Scripts">
-  <link href="/xml/opensearch-users.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Users">
+<!-- Open Search -->
+<link href="/xml/opensearch-groups.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Groups">
+<link href="/xml/opensearch-libraries.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Libraries">
+<link href="/xml/opensearch-scripts.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Scripts">
+<link href="/xml/opensearch-users.xml" type="application/opensearchdescription+xml" rel="search" title="OpenUserJS Users">
 
-  <!-- CSS -->
-  <link rel="stylesheet" type="text/css" media="all" href='/redist/npm/font-awesome/css/font-awesome.min.css'>
-  <link rel="stylesheet" type="text/css" media="all" href='/redist/npm/octicons/octicons/octicons.css'>
-  <link rel="stylesheet" type="text/css" media="all" href="/less/bootstrap/oujs.css">
-  <link rel="stylesheet" type="text/css" media="all" href="/css/common.css">
-  <link rel="stylesheet" type="text/css" media="all" href="/css/github.css">
-  
-  <!-- Google Analytics -->
-  <script type="text/javascript" src="//www.google-analytics.com/analytics.js" async></script>
+<!-- CSS -->
+<link rel="stylesheet" type="text/css" media="all" href='/redist/npm/font-awesome/css/font-awesome.min.css'>
+<link rel="stylesheet" type="text/css" media="all" href='/redist/npm/octicons/octicons/octicons.css'>
+<link rel="stylesheet" type="text/css" media="all" href="/less/bootstrap/oujs.css">
+<link rel="stylesheet" type="text/css" media="all" href="/css/common.css">
+<link rel="stylesheet" type="text/css" media="all" href="/css/github.css">
+
+{{^isDev}}
+<!-- Google Analytics -->
+<script type="text/javascript" src="//www.google-analytics.com/analytics.js" async="async"></script>
+{{/isDev}}
diff --git a/views/includes/scripts/googleAnalytics.html b/views/includes/scripts/googleAnalytics.html
new file mode 100644
index 000000000..0cb06026a
--- /dev/null
+++ b/views/includes/scripts/googleAnalytics.html
@@ -0,0 +1,16 @@
+<script type="text/javascript">
+  (function () {
+
+    var win = window;
+    win['GoogleAnalyticsObject'] = 'ga';
+    win['ga'] = win['ga'] || function () {
+        (win['ga'].q = win['ga'].q || []).push(arguments);
+    }
+
+    win['ga'].l = 1 * new Date();
+
+    ga('create', 'UA-59965387-1', 'auto');
+    ga('send', 'pageview');
+
+  })();
+</script>