From 107f28ea05f775ca238d129a525a306ba93fa867 Mon Sep 17 00:00:00 2001
From: Samuel Georges <sam@daftspunk.com>
Date: Sat, 14 Mar 2015 11:18:03 +1100
Subject: [PATCH] Fixes #997

---
 themes/demo/assets/javascript/app.js | 19 -------------------
 themes/demo/layouts/default.htm      | 12 ++++++++++++
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/themes/demo/assets/javascript/app.js b/themes/demo/assets/javascript/app.js
index 0eb442ff9..7955ff128 100644
--- a/themes/demo/assets/javascript/app.js
+++ b/themes/demo/assets/javascript/app.js
@@ -1,24 +1,5 @@
 /*
  * Application
- *
-
- */
-
-/*
- * Bootstrap
- * 
-=require ../vendor/bootstrap/js/transition
-=require ../vendor/bootstrap/js/alert
-=require ../vendor/bootstrap/js/button
-=require ../vendor/bootstrap/js/carousel
-=require ../vendor/bootstrap/js/collapse
-=require ../vendor/bootstrap/js/dropdown
-=require ../vendor/bootstrap/js/modal
-=require ../vendor/bootstrap/js/tooltip
-=require ../vendor/bootstrap/js/popover
-=require ../vendor/bootstrap/js/scrollspy
-=require ../vendor/bootstrap/js/tab
-=require ../vendor/bootstrap/js/affix
  */
 
 $(document).tooltip({
diff --git a/themes/demo/layouts/default.htm b/themes/demo/layouts/default.htm
index 9306a435b..f15181cfe 100644
--- a/themes/demo/layouts/default.htm
+++ b/themes/demo/layouts/default.htm
@@ -57,6 +57,18 @@ description = "Default layout"
         <!-- Scripts -->
         <script src="{{ [
             'assets/javascript/jquery.js',
+            'assets/vendor/bootstrap/js/transition.js',
+            'assets/vendor/bootstrap/js/alert.js',
+            'assets/vendor/bootstrap/js/button.js',
+            'assets/vendor/bootstrap/js/carousel.js',
+            'assets/vendor/bootstrap/js/collapse.js',
+            'assets/vendor/bootstrap/js/dropdown.js',
+            'assets/vendor/bootstrap/js/modal.js',
+            'assets/vendor/bootstrap/js/tooltip.js',
+            'assets/vendor/bootstrap/js/popover.js',
+            'assets/vendor/bootstrap/js/scrollspy.js',
+            'assets/vendor/bootstrap/js/tab.js',
+            'assets/vendor/bootstrap/js/affix.js',
             'assets/javascript/app.js'
         ]|theme }}"></script>
         {% framework extras %}