Skip to content

Commit b89396d

Browse files
committed
recompiled
1 parent c4a440a commit b89396d

File tree

2 files changed

+34
-44
lines changed

2 files changed

+34
-44
lines changed

hicbrowser/static/js/App.js

Lines changed: 31 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -14,59 +14,49 @@ var GeneView = require('./js/views/gene');
1414
var BrowserView = require('./js/views/browser');
1515
var Intro = require('./js/views/intro-header');
1616

17-
function initViews(){
18-
// Render initial views
19-
App.views.intro.render(App.config);
20-
App.views.search.render(App.config);
21-
}
22-
2317
App = {};
2418

25-
App.init = function(){
26-
27-
//Views
28-
App.views = {};
29-
App.views.loading = new Loading({el:'body'});
30-
App.views.search = new Search({el:'#search'});
31-
App.views.index = new Index({el:'#content'});
32-
App.views.gene = new GeneView({el:'#content'});
33-
App.views.browser = new BrowserView({el:'#content'});
34-
App.views.intro = new Intro({el:'.intro-header'});
19+
//Views
20+
App.views = {};
21+
App.views.loading = new Loading({el:'body'});
22+
App.views.search = new Search({el:'#search'});
23+
App.views.index = new Index({el:'#content'});
24+
App.views.gene = new GeneView({el:'#content'});
25+
App.views.browser = new BrowserView({el:'#content'});
26+
App.views.intro = new Intro({el:'.intro-header'});
27+
28+
// Models
29+
App.models = {};
30+
App.models.Gene = require('./js/models/gene');
31+
App.models.Browser = require('./js/models/browser');
32+
App.models.Config = require('./js/models/config');
33+
34+
//Router
35+
App.router = require('./js/router');
36+
37+
// listen to ajax
38+
$(document).ajaxStart(function() {
39+
App.views.loading.show();
40+
}).ajaxStop(function() {
41+
setTimeout(App.views.loading.hide, 800);
42+
});
3543

36-
// Models
37-
App.models = {};
38-
App.models.Gene = require('./js/models/gene');
39-
App.models.Browser = require('./js/models/browser');
40-
App.models.Config = require('./js/models/config');
44+
App.init = function(config){
4145

42-
// Init config with defaults
46+
// Init config
4347
App.config = new App.models.Config();
44-
45-
// See if there is a config file defined.
46-
// If not, load app with defaults
47-
App.config.fetch({
48-
success: initViews,
49-
error: initViews
50-
});
51-
52-
//Router
53-
App.router = require('./js/router');
54-
55-
// listen to ajax
56-
$(document).ajaxStart(function() {
57-
App.views.loading.show();
58-
}).ajaxStop(function() {
59-
setTimeout(App.views.loading.hide, 800);
60-
});
48+
App.config.set(config);
6149

6250
// Render loading
6351
App.views.loading.render();
6452

6553
// Select all elements with data-toggle="tooltips" in the document
6654
$('[data-toggle="tooltip"]').tooltip();
67-
};
6855

69-
App.init();
56+
// Render initial views
57+
App.views.intro.render(App.config);
58+
App.views.search.render(App.config);
59+
};
7060

7161
}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
7262
},{"./js/models/browser":2,"./js/models/config":3,"./js/models/gene":4,"./js/router":5,"./js/views/browser":7,"./js/views/gene":8,"./js/views/index":9,"./js/views/intro-header":10,"./js/views/loading":11,"./js/views/search":12,"backbone":16,"bootstrap":18,"jquery":78}],2:[function(require,module,exports){

0 commit comments

Comments
 (0)