Skip to content

Commit ffd02e7

Browse files
committed
A few minor changes, in preparation for my talk at DrupalCon.
1 parent ca5726b commit ffd02e7

File tree

6 files changed

+467
-35
lines changed

6 files changed

+467
-35
lines changed

ajax_load.html

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,34 @@
1717
<![endif]-->
1818
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.1/jquery.min.js"></script>
1919
<script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.10/jquery-ui.min.js"></script>
20+
<script>
21+
if (!window.jQuery) {
22+
document.write(unescape('%3Cscript src="assets/javascripts/jquery.js"%3E%3C/script%3E'));
23+
document.write(unescape('%3Cscript src="assets/javascripts/jquery.ui.js"%3E%3C/script%3E'));
24+
}
25+
</script>
2026
<script src="assets/javascripts/jquery.desktop.js"></script>
2127
<script>
22-
jQuery(document).ready(function($) {
23-
$('#ajax_load_trigger').click(function() {
24-
$(this).unbind();
25-
$('body').load('index.html #wrapper', function() {
26-
JQD.init.clock();
27-
JQD.init.wallpaper();
28+
jQuery(document).ready(function($) {
29+
$('#ajax_load_trigger').click(function() {
30+
$(this).remove();
31+
$('body').load('index.html #wrapper', function() {
32+
JQD.init.clock();
33+
JQD.init.wallpaper();
34+
});
35+
return false;
2836
});
29-
return false;
3037
});
31-
});
32-
</script>
33-
<script>
34-
var _gaq = [['_setAccount', 'UA-166674-8'], ['_trackPageview']];
3538

36-
(function(d, t) {
37-
var g = d.createElement(t),
38-
s = d.getElementsByTagName(t)[0];
39-
g.async = true;
40-
g.src = '//www.google-analytics.com/ga.js';
41-
s.parentNode.insertBefore(g, s);
42-
})(document, 'script');
39+
var _gaq = [['_setAccount', 'UA-166674-8'], ['_trackPageview']];
40+
41+
(function(d, t) {
42+
var g = d.createElement(t),
43+
s = d.getElementsByTagName(t)[0];
44+
g.async = true;
45+
g.src = '//www.google-analytics.com/ga.js';
46+
s.parentNode.insertBefore(g, s);
47+
})(this.document, 'script');
4348
</script>
4449
</head>
4550
<body>

assets/javascripts/jquery.desktop.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
//
2-
// Kick things off.
3-
//
4-
jQuery(document).ready(function() {
5-
JQD.go();
6-
});
7-
81
//
92
// Namespace - Module Pattern.
103
//
@@ -327,4 +320,11 @@ var JQD = (function($, window, undefined) {
327320
}
328321
};
329322
// Pass in jQuery.
330-
})(jQuery, this);
323+
})(jQuery, this);
324+
325+
//
326+
// Kick things off.
327+
//
328+
jQuery(document).ready(function() {
329+
JQD.go();
330+
});

assets/javascripts/jquery.js

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)