Mercurial > wikked
comparison 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 |
comparison
equal
deleted
inserted
replaced
148:f02e049d6546 | 149:d29e2f337b00 |
---|---|
2 * RequireJS configuration. | 2 * RequireJS configuration. |
3 * | 3 * |
4 * We need to alias/shim some of the libraries. | 4 * We need to alias/shim some of the libraries. |
5 */ | 5 */ |
6 require.config({ | 6 require.config({ |
7 urlArgs: "bust=" + (new Date()).getTime(), | 7 //urlArgs: "bust=" + (new Date()).getTime(), |
8 paths: { | 8 paths: { |
9 jquery: 'js/jquery-1.8.3.min', | 9 jquery: 'js/jquery-1.8.3.min', |
10 underscore: 'js/underscore-min', | 10 underscore: 'js/underscore-min', |
11 backbone: 'js/backbone-min', | 11 backbone: 'js/backbone-min', |
12 handlebars: 'js/handlebars-1.0.rc.1', | 12 handlebars: 'js/handlebars-1.0.rc.1', |
13 moment: 'js/moment.min', | 13 moment: 'js/moment.min', |
14 text: 'js/text', | 14 text: 'js/text', |
15 bootstrap_modal: 'bootstrap/js/bootstrap-modal', | 15 bootstrap_modal: 'bootstrap/js/modal', |
16 bootstrap_tooltip: 'bootstrap/js/bootstrap-tooltip' | 16 bootstrap_tooltip: 'bootstrap/js/tooltip', |
17 bootstrap_collapse: 'bootstrap/js/collapse' | |
17 }, | 18 }, |
18 shim: { | 19 shim: { |
19 'jquery': { | 20 'jquery': { |
20 exports: '$' | 21 exports: '$' |
21 }, | 22 }, |
31 }, | 32 }, |
32 'bootstrap_modal': { | 33 'bootstrap_modal': { |
33 deps: ['jquery'] | 34 deps: ['jquery'] |
34 }, | 35 }, |
35 'bootstrap_tooltip': { | 36 'bootstrap_tooltip': { |
37 deps: ['jquery'] | |
38 }, | |
39 'bootstrap_collapse': { | |
36 deps: ['jquery'] | 40 deps: ['jquery'] |
37 } | 41 } |
38 } | 42 } |
39 }); | 43 }); |
40 | 44 |