# HG changeset patch # User Ludovic Chabant # Date 1357343998 28800 # Node ID 5639fb1a3693baa97265c88dff51302ad6544670 # Parent f34fc906ded92c01b8921df403045759dc07e6b1 Added Bootstrap's Javascript to RequireJS bundle. diff -r f34fc906ded9 -r 5639fb1a3693 wikked/static/js/wikked.js --- 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) {