Commit 84266f55 authored by Mikaël Salson's avatar Mikaël Salson
Browse files

app.js: Don't load germline_builder before germline.js

Once germline.js is loaded we can load the remainder. Otherwise
germline_builder.js could be loaded before germline.js finished loading which
caused germline_builder to complain because it didn't know the variable
germline_data

This commit just moved lines and reindented them.
parent 4053dd67
......@@ -29,7 +29,37 @@ function loadAfterConf() {
require(["../view"], function() {
require(["../germline"],
function() { },
function() {
require(["../compare",
"../menu",
"../dbscan",
"../germline_builder",
"../segmenter",
"../model_loader",
"../model",
"../clone",
"../dynprog",
"../list",
"../axis",
"../graph",
"../scatterPlot",
"../builder",
"../com",
"../vidjil-style",
"../crossDomain",
"../database",
"../shortcut",
"../export",
"../similarity",
"../tools"
], function(){
if (typeof main == "undefined"){
require(["../main"]);
}else{
main();
}
})
},
function(err)
{
alert("The Vidjil web application client may not be properly installed: 'germline.js' is not found. Please run 'make browser'.");
......@@ -37,34 +67,5 @@ function loadAfterConf() {
}
)
require(["../compare",
"../menu",
"../dbscan",
"../germline_builder",
"../segmenter",
"../model_loader",
"../model",
"../clone",
"../dynprog",
"../list",
"../axis",
"../graph",
"../scatterPlot",
"../builder",
"../com",
"../vidjil-style",
"../crossDomain",
"../database",
"../shortcut",
"../export",
"../similarity",
"../tools"
], function(){
if (typeof main == "undefined"){
require(["../main"]);
}else{
main();
}
})
})
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment