aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2014-05-13 16:34:31 +0200
committerPacien TRAN-GIRARD2014-05-13 16:34:31 +0200
commit194dbb4a501f2912ac9f46e7e2cfc6e99e3c7246 (patch)
tree60c00f07682827ca12d6423556e57de567674fdb
parente9dc2c3cfffd883fb7a6069b37577c770094f04e (diff)
downloadio-slides-remote-194dbb4a501f2912ac9f46e7e2cfc6e99e3c7246.tar.gz
Load GA tracker with requirejs
Diffstat
-rw-r--r--js/slide-deck.js19
-rw-r--r--js/slides.js6
-rw-r--r--scripts/md/base.html39
-rw-r--r--slide_config.js10
-rw-r--r--template.html899
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) {
808 * @private 808 * @private
809 */ 809 */
810SlideDeck.prototype.loadAnalytics_ = function() { 810SlideDeck.prototype.loadAnalytics_ = function() {
811 var _gaq = window['_gaq'] || []; 811 window._gaq = window['_gaq'] || [];
812 _gaq.push([ '_setAccount', this.config_.settings.analytics ]); 812 window._gaq.push([ '_setAccount', this.config_.settings.analytics ]);
813 _gaq.push([ '_trackPageview' ]); 813 window._gaq.push([ '_trackPageview' ]);
814 814
815 (function() { 815 requirejs([ 'analytics' ]);
816 var ga = document.createElement('script');
817 ga.type = 'text/javascript';
818 ga.async = true;
819 ga.src = ('https:' == document.location.protocol ? 'https://ssl'
820 : 'http://www')
821 + '.google-analytics.com/ga.js';
822 var s = document.getElementsByTagName('script')[0];
823 s.parentNode.insertBefore(ga, s);
824 })();
825}; 816};
826 817
827// Polyfill missing APIs (if we need to), then create the slide deck. 818// 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({
7 'modernizr' : 'modernizr.custom.56571', 7 'modernizr' : 'modernizr.custom.56571',
8 'prettify' : 'prettify/prettify', 8 'prettify' : 'prettify/prettify',
9 'hammer' : 'hammer.min', 9 'hammer' : 'hammer.min',
10
11 'analytics' : 'https://www.google-analytics.com/ga'
10 }, 12 },
11 13
12 shim : { 14 shim : {
@@ -16,6 +18,4 @@ require.config({
16 } 18 }
17}); 19});
18 20
19require(['slide-deck'], function(someModule) { 21require(['slide-deck']);
20
21});
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
9<!DOCTYPE html> 9<!DOCTYPE html>
10<html> 10<html>
11 <head> 11 <head>
12 <title>Google IO 2012</title> 12 <title></title>
13 <meta charset="utf-8"> 13 <meta charset="utf-8">
14 <meta http-equiv="X-UA-Compatible" content="chrome=1"> 14 <meta http-equiv="X-UA-Compatible" content="chrome=1">
15 <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">--> 15 <!--<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
19 <meta name="apple-mobile-web-app-capable" content="yes"> 19 <meta name="apple-mobile-web-app-capable" content="yes">
20 <link rel="stylesheet" media="all" href="theme/css/default.css"> 20 <link rel="stylesheet" media="all" href="theme/css/default.css">
21 <link rel="stylesheet" media="all" href="theme/css/app.css"> 21 <link rel="stylesheet" media="all" href="theme/css/app.css">
22 <link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="theme/css/phone.css"> 22 <link rel="stylesheet" media="only screen and (max-device-width: 480px)"
23 href="theme/css/phone.css">
23 <base target="_blank"> 24 <base target="_blank">
24 <!-- This amazingness opens all links in a new tab. --> 25 <!-- This amazingness opens all links in a new tab. -->
25 <script data-main="js/slides" src="js/require.js"></script> 26 <script data-main="js/slides" src="js/require.js"></script>
@@ -27,7 +28,6 @@ URL: https://code.google.com/p/io-2012-slides
27 <body style="opacity: 0"> 28 <body style="opacity: 0">
28 29
29 <slides class="layout-widescreen"> 30 <slides class="layout-widescreen">
30
31 <!-- <slide class="logoslide nobackground"> 31 <!-- <slide class="logoslide nobackground">
32 <article class="flexbox vcenter"> 32 <article class="flexbox vcenter">
33 <span><img src="images/google_developers_logo.png"></span> 33 <span><img src="images/google_developers_logo.png"></span>
@@ -35,7 +35,8 @@ URL: https://code.google.com/p/io-2012-slides
35 </slide> 35 </slide>
36 --> 36 -->
37 <slide class="title-slide segue nobackground"> 37 <slide class="title-slide segue nobackground">
38 <aside class="gdbar"><img src="images/google_developers_icon_128.png"> 38 <aside class="gdbar">
39 <img src="images/google_developers_icon_128.png">
39 </aside> 40 </aside>
40 <!-- The content of this hgroup is replaced programmatically through the slide_config.json. --> 41 <!-- The content of this hgroup is replaced programmatically through the slide_config.json. -->
41 <hgroup class="auto-fadein"> 42 <hgroup class="auto-fadein">
@@ -46,11 +47,13 @@ URL: https://code.google.com/p/io-2012-slides
46 </p> 47 </p>
47 </hgroup> 48 </hgroup>
48 </slide> 49 </slide>
49
50 {% for slide in slides %} 50 {% for slide in slides %}
51 <slide {% if slide.class %}class="{{- slide.class -}}"{% endif %} {% if slide.image %}style="background-image: url({{- slide.image -}})"{% endif %}> 51 <slide {% if
52 slide.class %}class="{{- slide.class -}}" {% endif %} {% if
53 slide.image %}style="background-image: url({{- slide.image -}})"{% endif %}>
52 {% if 'segue' in slide.class %} 54 {% if 'segue' in slide.class %}
53 <aside class="gdbar"><img src="images/google_developers_icon_128.png"> 55 <aside class="gdbar">
56 <img src="images/google_developers_icon_128.png">
54 </aside> 57 </aside>
55 <hgroup class="auto-fadein"> 58 <hgroup class="auto-fadein">
56 <h2>{{- slide.title -}}</h2> 59 <h2>{{- slide.title -}}</h2>
@@ -67,9 +70,9 @@ URL: https://code.google.com/p/io-2012-slides
67 {% endif %} 70 {% endif %}
68 </slide> 71 </slide>
69 {% endfor %} 72 {% endfor %}
70
71 <slide class="thank-you-slide segue nobackground"> 73 <slide class="thank-you-slide segue nobackground">
72 <aside class="gdbar right"><img src="images/google_developers_icon_128.png"> 74 <aside class="gdbar right">
75 <img src="images/google_developers_icon_128.png">
73 </aside> 76 </aside>
74 <article class="flexbox vleft auto-fadein"> 77 <article class="flexbox vleft auto-fadein">
75 <h2>&lt;Thank You!&gt;</h2> 78 <h2>&lt;Thank You!&gt;</h2>
@@ -81,32 +84,14 @@ URL: https://code.google.com/p/io-2012-slides
81 <!-- populated from slide_config.json --> 84 <!-- populated from slide_config.json -->
82 </p> 85 </p>
83 </slide> 86 </slide>
84
85 <!-- <slide class="logoslide dark nobackground"> 87 <!-- <slide class="logoslide dark nobackground">
86 <article class="flexbox vcenter"> 88 <article class="flexbox vcenter">
87 <span><img src="images/google_developers_logo_white.png"></span> 89 <span><img src="images/google_developers_logo_white.png"></span>
88 </article> 90 </article>
89 </slide> --> 91 </slide> -->
90
91 <slide class="backdrop"></slide> 92 <slide class="backdrop"></slide>
92
93 </slides> 93 </slides>
94 94
95 <script>
96 var _gaq = _gaq || [];
97 _gaq.push(['_setAccount', 'UA-XXXXXXXX-1']);
98 _gaq.push(['_trackPageview']);
99
100 (function() {
101 var ga = document.createElement('script');
102 ga.type = 'text/javascript';
103 ga.async = true;
104 ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
105 var s = document.getElementsByTagName('script')[0];
106 s.parentNode.insertBefore(ga, s);
107 })();
108 </script>
109
110 <!--[if IE]> 95 <!--[if IE]>
111 <script src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script> 96 <script src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
112 <script>CFInstall.check({mode: 'overlay'});</script> 97 <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 = {
8 // date: '6/x/2013' 8 // date: '6/x/2013'
9 // }, 9 // },
10 useBuilds : true, // Default: true. False will turn off slide 10 useBuilds : true, // Default: true. False will turn off slide
11 // animation builds. 11 // animation builds.
12 usePrettify : true, // Default: true 12 usePrettify : true, // Default: true
13 enableSlideAreas : true, // Default: true. False turns off the click 13 enableSlideAreas : true, // Default: true. False turns off the click
14 // areas on either slide of the slides. 14 // areas on either slide of the slides.
15 enableTouch : true, // Default: true. If touch support should enabled. 15 enableTouch : true, // Default: true. If touch support should enabled.
16 // Note: the device must support touch. 16 // Note: the device must support touch.
17 // analytics: 'UA-XXXXXXXX-1', // TODO: Using this breaks GA for some 17 // analytics: 'UA-XXXXXXXX-1', // Google Analytics account ID
18 // reason (probably requirejs). Update your tracking code in
19 // template.html instead.
20 favIcon : 'images/google_developers_logo_tiny.png', 18 favIcon : 'images/google_developers_logo_tiny.png',
21 fonts : [ 'Open Sans:regular,semibold,italic,italicsemibold', 19 fonts : [ 'Open Sans:regular,semibold,italic,italicsemibold',
22 'Source Code Pro' ], 20 '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 @@
2Google IO 2012/2013 HTML5 Slide Template 2Google IO 2012/2013 HTML5 Slide Template
3 3
4Authors: Eric Bidelman <ebidel@gmail.com> 4Authors: Eric Bidelman <ebidel@gmail.com>
5 Luke Mahé <lukem@google.com> 5Luke Mahé <lukem@google.com>
6 6
7URL: https://code.google.com/p/io-2012-slides 7URL: https://code.google.com/p/io-2012-slides
8--> 8-->
9<!DOCTYPE html> 9<!DOCTYPE html>
10<html> 10<html>
11<head> 11 <head>
12 <title></title> 12 <title></title>
13 <meta charset="utf-8"> 13 <meta charset="utf-8">
14 <meta http-equiv="X-UA-Compatible" content="chrome=1"> 14 <meta http-equiv="X-UA-Compatible" content="chrome=1">
15 <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">--> 15 <!--<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">-->
16 <!--<meta name="viewport" content