Skip to content

gargantext
gargantext
Commit 3fa340d6 authored by delanoe's avatar delanoe
Browse files
Options

Merge branch 'samuel' into unstable

parents d9c0428f 5e43368b
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 16 deletions
static/js/NGrams_dyna_chart_and_table.js
View file @ 3fa340d6
...@@ -556,20 +556,16 @@ $("#Save_All").click(function(){ ...@@ -556,20 +556,16 @@ $("#Save_All").click(function(){
var list_id = $("#list_id").val() var list_id = $("#list_id").val()
var corpus_id = getIDFromURL( "corpus" ) // not used var corpus_id = getIDFromURL( "corpus" ) // not used
// $.when(
// ).then(function() {
// // window.location.reload()
// });
$("#Save_All").append('<img width="8%" src="/static/img/ajax-loader.gif"></img>') $("#Save_All").append('<img width="8%" src="/static/img/ajax-loader.gif"></img>')
CRUD( corpus_id , "/group" , [] , nodes_2group , "PUT" ) CRUD( corpus_id , "/group" , [] , nodes_2group , "PUT" , function(result) {
$.doTimeout( 1000, function(){ console.log(" UN ELEFANTE "+result)
CRUD( corpus_id , "/keep" , [] , nodes_2inmap , "PUT" ) CRUD( corpus_id , "/keep" , [] , nodes_2inmap , "PUT" , function(result) {
$.doTimeout( 1000, function(){ console.log(" DOS ELEFANTES "+result)
CRUD( corpus_id , "/keep" , [] , nodes_2outmap , "DELETE" ) CRUD( corpus_id , "/keep" , [] , nodes_2outmap , "DELETE" , function(result) {
$.doTimeout( 1000, function(){ console.log(" TRES ELEFANTES "+result)
CRUD( list_id , "" , nodes_2del , [] , "DELETE" ), CRUD( list_id , "" , nodes_2del , [] , "DELETE", function(result) {
$.doTimeout( 1000, function(){ console.log(" CUATRO ELEFANTES "+result)
window.location.reload() window.location.reload()
}); });
}); });
...@@ -578,7 +574,7 @@ $("#Save_All").click(function(){ ...@@ -578,7 +574,7 @@ $("#Save_All").click(function(){
}); });
function CRUD( parent_id , action , nodes , args , http_method ) { function CRUD( parent_id , action , nodes , args , http_method , callback) {
var the_url = window.location.origin+"/api/node/"+parent_id+"/ngrams"+action+"/"+nodes.join("+"); var the_url = window.location.origin+"/api/node/"+parent_id+"/ngrams"+action+"/"+nodes.join("+");
the_url = the_url.replace(/\/$/, ""); //remove trailing slash the_url = the_url.replace(/\/$/, ""); //remove trailing slash
if(nodes.length>0 || Object.keys(args).length>0) { if(nodes.length>0 || Object.keys(args).length>0) {
...@@ -593,16 +589,16 @@ function CRUD( parent_id , action , nodes , args , http_method ) { ...@@ -593,16 +589,16 @@ function CRUD( parent_id , action , nodes , args , http_method ) {
console.log(http_method + " ok!!") console.log(http_method + " ok!!")
console.log(nodes) console.log(nodes)
console.log(data) console.log(data)
return true; callback(true);
}, },
error: function(result) { error: function(result) {
console.log("Data not found in #Save_All"); console.log("Data not found in #Save_All");
console.log(result) console.log(result)
return false; callback(false);
} }
}); });
} } else callback(false);
} }
function Main_test( data , initial) { function Main_test( data , initial) {
......
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