aboutsummaryrefslogtreecommitdiff
path: root/js/slides.js
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2014-05-12 23:40:30 +0200
committerPacien TRAN-GIRARD2014-05-12 23:40:30 +0200
commit1a219a4c2c5694168d81c239f9cc437c0e7fb15b (patch)
tree612eb7fe061710ac9379b1da6223f07d75c37ac5 /js/slides.js
parent7296e05b83df9d92c138a4439bb1848213acf646 (diff)
downloadio-slides-remote-1a219a4c2c5694168d81c239f9cc437c0e7fb15b.tar.gz
Update require.js
Diffstat (limited to 'js/slides.js')
-rw-r--r--js/slides.js23
1 files changed, 19 insertions, 4 deletions
diff --git a/js/slides.js b/js/slides.js
index 9966d0b..edc31bb 100644
--- a/js/slides.js
+++ b/js/slides.js
@@ -1,6 +1,21 @@
1require([ 'order!../slide_config', 'order!modernizr.custom.45394', 1require.config({
2 'order!prettify/prettify', 'order!hammer', 2 paths : {
3 'order!//webcastor.herokuapp.com/socket.io/socket.io.js', 3 'slide_config' : '../slide_config',
4 'order!slide-controller', 'order!slide-deck' ], function(someModule) { 4 'slide-controller' : 'slide-controller',
5 'slide-deck' : 'slide-deck',
6
7 'modernizr' : 'modernizr.custom.45394',
8 'prettify' : 'prettify/prettify',
9 'hammer' : 'hammer',
10 },
11
12 shim : {
13 'slide-deck' : {
14 deps : ['slide_config', 'slide-controller', 'modernizr', 'hammer']
15 }
16 }
17});
18
19require(['slide-deck', 'prettify'], function(someModule) {
5 20
6}); 21});