Mercurial > wikked
diff static/js/wikked.js @ 149:d29e2f337b00
Updated to Bootstrap 3.0.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Thu, 12 Dec 2013 21:54:04 -0800 |
parents | 13249e5ca51c |
children |
line wrap: on
line diff
--- a/static/js/wikked.js Wed Dec 11 21:51:51 2013 -0800 +++ b/static/js/wikked.js Thu Dec 12 21:54:04 2013 -0800 @@ -4,7 +4,7 @@ * We need to alias/shim some of the libraries. */ require.config({ - urlArgs: "bust=" + (new Date()).getTime(), + //urlArgs: "bust=" + (new Date()).getTime(), paths: { jquery: 'js/jquery-1.8.3.min', underscore: 'js/underscore-min', @@ -12,8 +12,9 @@ handlebars: 'js/handlebars-1.0.rc.1', moment: 'js/moment.min', text: 'js/text', - bootstrap_modal: 'bootstrap/js/bootstrap-modal', - bootstrap_tooltip: 'bootstrap/js/bootstrap-tooltip' + bootstrap_modal: 'bootstrap/js/modal', + bootstrap_tooltip: 'bootstrap/js/tooltip', + bootstrap_collapse: 'bootstrap/js/collapse' }, shim: { 'jquery': { @@ -34,6 +35,9 @@ }, 'bootstrap_tooltip': { deps: ['jquery'] + }, + 'bootstrap_collapse': { + deps: ['jquery'] } } });