From 1a219a4c2c5694168d81c239f9cc437c0e7fb15b Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Mon, 12 May 2014 23:40:30 +0200
Subject: Update require.js

---
 js/slides.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'js/slides.js')

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 @@
-require([ 'order!../slide_config', 'order!modernizr.custom.45394',
-		'order!prettify/prettify', 'order!hammer',
-		'order!//webcastor.herokuapp.com/socket.io/socket.io.js',
-		'order!slide-controller', 'order!slide-deck' ], function(someModule) {
+require.config({
+	paths : {
+		'slide_config' : '../slide_config',
+		'slide-controller' : 'slide-controller',
+		'slide-deck' : 'slide-deck',
+
+		'modernizr' : 'modernizr.custom.45394',
+		'prettify' : 'prettify/prettify',
+		'hammer' : 'hammer',
+	},
+
+	shim : {
+		'slide-deck' : {
+			deps : ['slide_config', 'slide-controller', 'modernizr', 'hammer']
+		}
+	}
+});
+
+require(['slide-deck', 'prettify'], function(someModule) {
 
 });
-- 
cgit v1.2.3