From 1dbfad6c4a4fc29c2cb6461db094dd18e755fd01 Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sun, 30 Oct 2011 09:31:44 +0000
Subject: [PATCH] disable js bundle for now
---
server/djrandom/frontend/static/Makefile | 2 +-
server/djrandom/frontend/templates/index.html | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/server/djrandom/frontend/static/Makefile b/server/djrandom/frontend/static/Makefile
index 56ef1a0..6bc41e3 100644
--- a/server/djrandom/frontend/static/Makefile
+++ b/server/djrandom/frontend/static/Makefile
@@ -29,7 +29,7 @@ all: subdirs bundles compress
clean:
$(MAKE) -C js/djr clean
- -rm -f $(BUNDLES) $(COMPRESSED_BUNDLES)
+ -rm -f $(CSS_SINGLE_FILE) $(JS_SINGLE_FILE) $(COMPRESSED_BUNDLES)
subdirs:
$(MAKE) -C js/djr
diff --git a/server/djrandom/frontend/templates/index.html b/server/djrandom/frontend/templates/index.html
index 7b71fc1..a5bcef2 100644
--- a/server/djrandom/frontend/templates/index.html
+++ b/server/djrandom/frontend/templates/index.html
@@ -44,10 +44,23 @@
<script type="text/javascript"
src="/static/js/jquery-1.6.4.min.js"></script>
+ <script type="text/javascript"
+ src="/static/js/jquery.autocomplete.min.js"></script>
<script type="text/javascript"
src="/static/js/jquery.fullbg.min.js"></script>
<script type="text/javascript"
- src="/static/js/bundle.js"></script>
+ src="/static/js/jquery.transform.min.js"></script>
+ <script type="text/javascript"
+ src="/static/js/jquery.grab.min.js"></script>
+ <script type="text/javascript"
+ src="/static/js/mod.csstransforms.min.js"></script>
+ <script type="text/javascript"
+ src="/static/js/jquery.jplayer.min.js"></script>
+ <script type="text/javascript"
+ src="/static/js/circle.player.min.js"></script>
+
+ <script type="text/javascript"
+ src="/static/js/djr/djr.min.js"></script>
{% endif %}
<script type="text/javascript">
--
GitLab