summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--pyload/web/app/scripts/config.js1
-rw-r--r--pyload/web/bower.json2
2 files changed, 2 insertions, 1 deletions
diff --git a/pyload/web/app/scripts/config.js b/pyload/web/app/scripts/config.js
index 51ea63285..85620b2b7 100644
--- a/pyload/web/app/scripts/config.js
+++ b/pyload/web/app/scripts/config.js
@@ -17,6 +17,7 @@ require.config({
underscore: '../components/underscore/underscore',
backbone: '../components/backbone/backbone',
marionette: '../components/backbone.marionette/lib/backbone.marionette',
+ // version must be tested carefully, many are broken for amd
handlebars: '../components/handlebars.js/dist/handlebars',
jed: '../components/jed/jed',
moment: '../components/momentjs/moment',
diff --git a/pyload/web/bower.json b/pyload/web/bower.json
index b429a5bd4..4da3634a0 100644
--- a/pyload/web/bower.json
+++ b/pyload/web/bower.json
@@ -14,7 +14,7 @@
"underscore": "~1.5.1",
"backbone": "~1.0.0",
"backbone.marionette": "~1.1.0",
- "handlebars.js": "1.0.12",
+ "handlebars.js": "1.0.0-rc.3",
"jed": "~0.5.4",
"select2": "~3.4.0",
"momentjs": "~2.1.0"