5 files changed, 552 insertions, 421 deletions
diff --git a/js/slide-deck.js b/js/slide-deck.js
index 266de5c..f5d21c6 100644
--- a/js/slide-deck.js
+++ b/js/slide-deck.js
@@ -808,20 +808,11 @@ SlideDeck.prototype.loadTheme_ = function(theme) {
 * @private
 */
 SlideDeck.prototype.loadAnalytics_ = function() {
-        var _gaq = window['_gaq'] || [];
+        window._gaq = window['_gaq'] || [];
-        _gaq.push([ '_setAccount', this.config_.settings.analytics ]);
+        window._gaq.push([ '_setAccount', this.config_.settings.analytics ]);
-        _gaq.push([ '_trackPageview' ]);
+        window._gaq.push([ '_trackPageview' ]);
-        (function() {
+        requirejs([ 'analytics' ]);
-                var ga = document.createElement('script');
-                ga.type = 'text/javascript';
-                ga.async = true;
-                ga.src = ('https:' == document.location.protocol ? 'https://ssl'
-                                : 'http://www')
-                                + '.google-analytics.com/ga.js';
-                var s = document.getElementsByTagName('script')[0];
-                s.parentNode.insertBefore(ga, s);
-        })();
 };
 // Polyfill missing APIs (if we need to), then create the slide deck.
diff --git a/js/slides.js b/js/slides.js
index bfef324..143dac2 100644
--- a/js/slides.js
+++ b/js/slides.js
@@ -7,6 +7,8 @@ require.config({
                'modernizr' : 'modernizr.custom.56571',
                'prettify' : 'prettify/prettify',
                'hammer' : 'hammer.min',
+                'analytics' : 'https://www.google-analytics.com/ga'
        },
        shim : {
@@ -16,6 +18,4 @@ require.config({
        }
 });
-require(['slide-deck'], function(someModule) {
+require(['slide-deck']);
-});
diff --git a/scripts/md/base.html b/scripts/md/base.html
index 638dbb8..84f6aa9 100644
--- a/scripts/md/base.html
+++ b/scripts/md/base.html
@@ -9,7 +9,7 @@ URL: https://code.google.com/p/io-2012-slides
 <!DOCTYPE html>
 <html>
    <head>
-        <title>Google IO 2012</title>
+        <title></title>
        <meta charset="utf-8">
        <meta http-equiv="X-UA-Compatible" content="chrome=1">
        <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">-->
@@ -19,7 +19,8 @@ URL: https://code.google.com/p/io-2012-slides
        <meta name="apple-mobile-web-app-capable" content="yes">
        <link rel="stylesheet" media="all" href="theme/css/default.css">
        <link rel="stylesheet" media="all" href="theme/css/app.css">
-        <link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="theme/css/phone.css">
+        <link rel="stylesheet" media="only screen and (max-device-width: 480px)"
+        href="theme/css/phone.css">
        <base target="_blank">
        <!-- This amazingness opens all links in a new tab. -->
        <script data-main="js/slides" src="js/require.js"></script>
@@ -27,7 +28,6 @@ URL: https://code.google.com/p/io-2012-slides
    <body style="opacity: 0">
        <slides class="layout-widescreen">
            <!-- <slide class="logoslide nobackground">
            <article class="flexbox vcenter">
            <span><img src="images/google_developers_logo.png"></span>
@@ -35,7 +35,8 @@ URL: https://code.google.com/p/io-2012-slides
            </slide>
            -->
            <slide class="title-slide segue nobackground">
-                <aside class="gdbar"><img src="images/google_developers_icon_128.png">
+                <aside class="gdbar">
+                    <img src="images/google_developers_icon_128.png">
                </aside>
                <!-- The content of this hgroup is replaced programmatically through the slide_config.json. -->
                <hgroup class="auto-fadein">
@@ -46,11 +47,13 @@ URL: https://code.google.com/p/io-2012-slides
                    </p>
                </hgroup>
            </slide>
            {% for slide in slides %}
-            <slide {% if slide.class %}class="{{- slide.class -}}"{% endif %} {% if slide.image %}style="background-image: url({{- slide.image -}})"{% endif %}>
+            <slide {% if
+            slide.class %}class="{{- slide.class -}}" {% endif %} {% if
+            slide.image %}style="background-image: url({{- slide.image -}})"{% endif %}>
                {% if 'segue' in slide.class %}
-                <aside class="gdbar"><img src="images/google_developers_icon_128.png">
+                <aside class="gdbar">
+                    <img src="images/google_developers_icon_128.png">
                </aside>
                <hgroup class="auto-fadein">
                    <h2>{{- slide.title -}}</h2>
@@ -67,9 +70,9 @@ URL: https://code.google.com/p/io-2012-slides
                {% endif %}
            </slide>
            {% endfor %}
            <slide class="thank-you-slide segue nobackground">
-                <aside class="gdbar right"><img src="images/google_developers_icon_128.png">
+                <aside class="gdbar right">
+                    <img src="images/google_developers_icon_128.png">
                </aside>
                <article class="flexbox vleft auto-fadein">
                    <h2>&lt;Thank You!&gt;</h2>
@@ -81,32 +84,14 @@ URL: https://code.google.com/p/io-2012-slides
                    <!-- populated from slide_config.json -->
                </p>
            </slide>
            <!-- <slide class="logoslide dark nobackground">
            <article class="flexbox vcenter">
            <span><img src="images/google_developers_logo_white.png"></span>
            </article>
            </slide> -->
            <slide class="backdrop"></slide>
        </slides>
-        <script>
-                        var _gaq = _gaq || [];
-                        _gaq.push(['_setAccount', 'UA-XXXXXXXX-1']);
-                        _gaq.push(['_trackPageview']);
-                        (function() {
-                                var ga = document.createElement('script');
-                                ga.type = 'text/javascript';
-                                ga.async = true;
-                                ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-                                var s = document.getElementsByTagName('script')[0];
-                                s.parentNode.insertBefore(ga, s);
-                        })();
-        </script>
        <!--[if IE]>
        <script src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
        <script>CFInstall.check({mode: 'overlay'});</script>
diff --git a/slide_config.js b/slide_config.js
index 83ab855..4d0d89d 100644
--- a/slide_config.js
+++ b/slide_config.js
@@ -8,15 +8,13 @@ var SLIDE_CONFIG = {
                // date: '6/x/2013'
                // },
                useBuilds : true, // Default: true. False will turn off slide
-                                                        // animation builds.
+                // animation builds.
                usePrettify : true, // Default: true
                enableSlideAreas : true, // Default: true. False turns off the click
-                                                                        // areas on either slide of the slides.
+                // areas on either slide of the slides.
                enableTouch : true, // Default: true. If touch support should enabled.
-                                                        // Note: the device must support touch.
+                // Note: the device must support touch.
-                // analytics: 'UA-XXXXXXXX-1', // TODO: Using this breaks GA for some
+                // analytics: 'UA-XXXXXXXX-1', // Google Analytics account ID
-                // reason (probably requirejs). Update your tracking code in
-                // template.html instead.
                favIcon : 'images/google_developers_logo_tiny.png',
                fonts : [ 'Open Sans:regular,semibold,italic,italicsemibold',
                                'Source Code Pro' ],
diff --git a/template.html b/template.html
index 64ac86c..3f8a487 100644
--- a/template.html
+++ b/template.html
@@ -2,112 +2,155 @@
 Google IO 2012/2013 HTML5 Slide Template
 Authors: Eric Bidelman <ebidel@gmail.com>
-         Luke Mahé <lukem@google.com>
+Luke Mahé <lukem@google.com>
 URL: https://code.google.com/p/io-2012-slides
 -->
 <!DOCTYPE html>
 <html>
-<head>
+    <head>
-  <title></title>
+        <title></title>
-  <meta charset="utf-8">
+        <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="chrome=1">
+        <meta http-equiv="X-UA-Compatible" content="chrome=1">
-  <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">-->
+        <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">-->
-  <!--<meta name="viewport" content="width=device-width, initial-scale=1.0">-->
+        <!--<meta name="viewport" content="width=device-width, initial-scale=1.0">-->
-  <!--This one seems to work all the time, but really small on ipad-->
+        <!--This one seems to work all the time, but really small on ipad-->
-  <!--<meta name="viewport" content="initial-scale=0.4">-->
+        <!--<meta name="viewport" content="initial-scale=0.4">-->