@@ -12,56 +12,46 @@ var GeneView = require('./js/views/gene');
12
12
var BrowserView = require ( './js/views/browser' ) ;
13
13
var Intro = require ( './js/views/intro-header' ) ;
14
14
15
- function initViews ( ) {
16
- // Render initial views
17
- App . views . intro . render ( App . config ) ;
18
- App . views . search . render ( App . config ) ;
19
- }
20
-
21
15
App = { } ;
22
16
23
- App . init = function ( ) {
24
-
25
- //Views
26
- App . views = { } ;
27
- App . views . loading = new Loading ( { el :'body' } ) ;
28
- App . views . search = new Search ( { el :'#search' } ) ;
29
- App . views . index = new Index ( { el :'#content' } ) ;
30
- App . views . gene = new GeneView ( { el :'#content' } ) ;
31
- App . views . browser = new BrowserView ( { el :'#content' } ) ;
32
- App . views . intro = new Intro ( { el :'.intro-header' } ) ;
33
-
34
- // Models
35
- App . models = { } ;
36
- App . models . Gene = require ( './js/models/gene' ) ;
37
- App . models . Browser = require ( './js/models/browser' ) ;
38
- App . models . Config = require ( './js/models/config' ) ;
39
-
40
- // Init config with defaults
17
+ //Views
18
+ App . views = { } ;
19
+ App . views . loading = new Loading ( { el :'body' } ) ;
20
+ App . views . search = new Search ( { el :'#search' } ) ;
21
+ App . views . index = new Index ( { el :'#content' } ) ;
22
+ App . views . gene = new GeneView ( { el :'#content' } ) ;
23
+ App . views . browser = new BrowserView ( { el :'#content' } ) ;
24
+ App . views . intro = new Intro ( { el :'.intro-header' } ) ;
25
+
26
+ // Models
27
+ App . models = { } ;
28
+ App . models . Gene = require ( './js/models/gene' ) ;
29
+ App . models . Browser = require ( './js/models/browser' ) ;
30
+ App . models . Config = require ( './js/models/config' ) ;
31
+
32
+ //Router
33
+ App . router = require ( './js/router' ) ;
34
+
35
+ // listen to ajax
36
+ $ ( document ) . ajaxStart ( function ( ) {
37
+ App . views . loading . show ( ) ;
38
+ } ) . ajaxStop ( function ( ) {
39
+ setTimeout ( App . views . loading . hide , 800 ) ;
40
+ } ) ;
41
+
42
+ App . init = function ( config ) {
43
+
44
+ // Init config
41
45
App . config = new App . models . Config ( ) ;
42
-
43
- // See if there is a config file defined.
44
- // If not, load app with defaults
45
- App . config . fetch ( {
46
- success : initViews ,
47
- error : initViews
48
- } ) ;
49
-
50
- //Router
51
- App . router = require ( './js/router' ) ;
52
-
53
- // listen to ajax
54
- $ ( document ) . ajaxStart ( function ( ) {
55
- App . views . loading . show ( ) ;
56
- } ) . ajaxStop ( function ( ) {
57
- setTimeout ( App . views . loading . hide , 800 ) ;
58
- } ) ;
46
+ App . config . set ( config ) ;
59
47
60
48
// Render loading
61
49
App . views . loading . render ( ) ;
62
50
63
51
// Select all elements with data-toggle="tooltips" in the document
64
52
$ ( '[data-toggle="tooltip"]' ) . tooltip ( ) ;
65
- } ;
66
53
67
- App . init ( ) ;
54
+ // Render initial views
55
+ App . views . intro . render ( App . config ) ;
56
+ App . views . search . render ( App . config ) ;
57
+ } ;
0 commit comments