Mercurial > wikked

changeset 21:5639fb1a3693

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added Bootstrap's Javascript to RequireJS bundle.
author Ludovic Chabant <ludovic@chabant.com>
date Fri, 04 Jan 2013 15:59:58 -0800
parents f34fc906ded9
children 65c8a53a0e53
files wikked/static/js/wikked.js
diffstat 1 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/wikked/static/js/wikked.js	Fri Jan 04 15:58:54 2013 -0800
+++ b/wikked/static/js/wikked.js	Fri Jan 04 15:59:58 2013 -0800
@@ -9,7 +9,8 @@
         jquery: 'jquery-1.8.3.min',
         underscore: 'underscore-min',
         backbone: 'backbone-min',
-        handlebars: 'handlebars-1.0.rc.1'
+        handlebars: 'handlebars-1.0.rc.1',
+        bootstrap: '/bootstrap/js/bootstrap.min'
     },
     shim: {
         'jquery': {
@@ -24,6 +25,9 @@
         },
         'handlebars': {
             exports: 'Handlebars'
+        },
+        'bootstrap': {
+            deps: ['jquery']
         }
     }
 });
@@ -40,7 +44,8 @@
         'wikked/app', 
         'wikked/handlebars', 
         'wikked/client', 
-        'backbone'
+        'backbone',
+        'bootstrap'
         ],
     function(app, hb, client, Backbone) {