Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
vidjil
vidjil
Commits
61fab8f7
Commit
61fab8f7
authored
Oct 22, 2014
by
Marc Duez
Browse files
model.js : debug parsejson from url
parent
67744b02
Changes
2
Hide whitespace changes
Inline
Side-by-side
browser/js/model.js
View file @
61fab8f7
...
...
@@ -154,13 +154,7 @@ Model.prototype = {
oFReader
.
readAsText
(
oFile
);
oFReader
.
onload
=
function
(
oFREvent
)
{
try
{
var
data
=
jQuery
.
parseJSON
(
oFREvent
.
target
.
result
)
}
catch
(
e
)
{
myConsole
.
popupMsg
(
myConsole
.
msg
.
file_error
);
return
0
}
self
.
parseJsonData
(
data
,
limit
)
self
.
parseJsonData
(
oFREvent
.
target
.
result
,
limit
)
.
loadGermline
()
.
loadAnalysis
(
analysis
);
self
.
dataFileName
=
document
.
getElementById
(
id
)
...
...
@@ -224,7 +218,16 @@ Model.prototype = {
this
.
dataCluster
=
[]
this
.
clusters
=
[]
console
.
log
(
data
)
if
(
typeof
data
==
"
string
"
)
{
var
json_text
=
data
try
{
var
data
=
jQuery
.
parseJSON
(
json_text
)
}
catch
(
e
)
{
myConsole
.
popupMsg
(
myConsole
.
msg
.
file_error
);
return
0
}
}
if
((
typeof
(
data
.
vidjil_json_version
)
==
'
undefined
'
)
||
(
data
.
vidjil_json_version
<
VIDJIL_JSON_VERSION
))
{
myConsole
.
popupMsg
(
myConsole
.
msg
.
version_error
);
return
0
;
...
...
server/fuse.py
View file @
61fab8f7
...
...
@@ -30,7 +30,7 @@ import datetime
from
operator
import
itemgetter
VIDJIL_JSON_VERSION
=
"2014.0
9
"
VIDJIL_JSON_VERSION
=
"2014.
1
0"
GERMLINES_ORDER
=
[
'TRA'
,
'TRB'
,
'TRG'
,
'TRD'
,
'DD'
,
'IGH'
,
'DHJH'
,
'IJK'
,
'IJL'
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment