annotate static/js/wikked.js @ 62:a73a3c0b6d4a

Fixed some bugs with the page state warning. TODO: still another bug to fix where the state info comes in between the path update and the content update.
author Ludovic Chabant <ludovic@chabant.com>
date Wed, 06 Feb 2013 17:39:03 -0800
parents 130eccd396d8
children 97efd73f2158
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
c946f4facfa2 Initial commit.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
1 /**
15
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
2 * RequireJS configuration.
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
3 *
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
4 * We need to alias/shim some of the libraries.
0
c946f4facfa2 Initial commit.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
5 */
15
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
6 require.config({
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
7 urlArgs: "bust=" + (new Date()).getTime(),
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
8 paths: {
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
9 jquery: 'jquery-1.8.3.min',
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
10 underscore: 'underscore-min',
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
11 backbone: 'backbone-min',
21
5639fb1a3693 Added Bootstrap's Javascript to RequireJS bundle.
Ludovic Chabant <ludovic@chabant.com>
parents: 15
diff changeset
12 handlebars: 'handlebars-1.0.rc.1',
61
130eccd396d8 Now using Boostrap with LESS.
Ludovic Chabant <ludovic@chabant.com>
parents: 60
diff changeset
13 bootstrap_modal: '/bootstrap/js/bootstrap-modal'
15
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
14 },
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
15 shim: {
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
16 'jquery': {
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
17 exports: '$'
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
18 },
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
19 'underscore': {
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
20 exports: '_'
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
21 },
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
22 'backbone': {
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
23 deps: ['underscore', 'jquery'],
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
24 exports: 'Backbone'
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
25 },
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
26 'handlebars': {
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
27 exports: 'Handlebars'
21
5639fb1a3693 Added Bootstrap's Javascript to RequireJS bundle.
Ludovic Chabant <ludovic@chabant.com>
parents: 15
diff changeset
28 },
61
130eccd396d8 Now using Boostrap with LESS.
Ludovic Chabant <ludovic@chabant.com>
parents: 60
diff changeset
29 'bootstrap_modal': {
21
5639fb1a3693 Added Bootstrap's Javascript to RequireJS bundle.
Ludovic Chabant <ludovic@chabant.com>
parents: 15
diff changeset
30 deps: ['jquery']
0
c946f4facfa2 Initial commit.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
31 }
c946f4facfa2 Initial commit.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
32 }
11
aa6951805e1a New features and bug fixes:
Ludovic Chabant <ludovic@chabant.com>
parents: 10
diff changeset
33 });
3
59cad6ce1a1c Added support for history and diffing.
Ludovic Chabant <ludovic@chabant.com>
parents: 0
diff changeset
34
59cad6ce1a1c Added support for history and diffing.
Ludovic Chabant <ludovic@chabant.com>
parents: 0
diff changeset
35 //-------------------------------------------------------------//
59cad6ce1a1c Added support for history and diffing.
Ludovic Chabant <ludovic@chabant.com>
parents: 0
diff changeset
36
59cad6ce1a1c Added support for history and diffing.
Ludovic Chabant <ludovic@chabant.com>
parents: 0
diff changeset
37 /**
15
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
38 * Entry point: run Backbone!
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
39 *
40
81333391792d Moved client code from HTML template to `views.js`.
Ludovic Chabant <ludovic@chabant.com>
parents: 21
diff changeset
40 * We also import scripts like `handlebars` that are not used directly
81333391792d Moved client code from HTML template to `views.js`.
Ludovic Chabant <ludovic@chabant.com>
parents: 21
diff changeset
41 * by anybody, but need to be evaluated.
0
c946f4facfa2 Initial commit.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
42 */
15
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
43 require([
40
81333391792d Moved client code from HTML template to `views.js`.
Ludovic Chabant <ludovic@chabant.com>
parents: 21
diff changeset
44 'wikked/app',
81333391792d Moved client code from HTML template to `views.js`.
Ludovic Chabant <ludovic@chabant.com>
parents: 21
diff changeset
45 'wikked/handlebars',
21
5639fb1a3693 Added Bootstrap's Javascript to RequireJS bundle.
Ludovic Chabant <ludovic@chabant.com>
parents: 15
diff changeset
46 'backbone',
48
9658edea3121 Now using RequireJS' "text" extension to load all HTML templates.
Ludovic Chabant <ludovic@chabant.com>
parents: 40
diff changeset
47 'text'
15
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
48 ],
48
9658edea3121 Now using RequireJS' "text" extension to load all HTML templates.
Ludovic Chabant <ludovic@chabant.com>
parents: 40
diff changeset
49 function(app, hb, Backbone, textExtension) {
3
59cad6ce1a1c Added support for history and diffing.
Ludovic Chabant <ludovic@chabant.com>
parents: 0
diff changeset
50
15
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
51 var router = new app.Router();
238299b93f4c Made all Javascript code use RequireJS.
Ludovic Chabant <ludovic@chabant.com>
parents: 13
diff changeset
52 Backbone.history.start();//{ pushState: true });
0
c946f4facfa2 Initial commit.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
53
c946f4facfa2 Initial commit.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
54 });
c946f4facfa2 Initial commit.
Ludovic Chabant <ludovic@chabant.com>
parents:
diff changeset
55