Merge remote-tracking branch 'origin/romain-testing' into testing-merge

gargantext/util/toolchain/list_stop.py

@@ -37,11 +37,10 @@ def is_stop_word(ngram, stop_words=None):
             , "(.*)(différent)(.*)"
             , "(.*)(travers)(.*)"
             # academic stamps
-            , ".*\belsevier\b.*"
-            , ".*\bwiley\b.*"
-            , ".*\bspringer\b.*"
-            , ".*university press\b.*"
-            , ".*\bstudy\b.*"
+            , ".*elsevier.*"
+            , ".*wiley.*"
+            , ".*springer.*"
+            , ".*university press.*"
             # academic terms when alone ~~> usually not informative
             , "hypothes[ie]s$"
             , "analys[ie]s$"

static/lib/gargantext/garganrest_projects.js

@@ -204,27 +204,24 @@ function getRessources(){
 //// PUT AND PATCH TO API
 function deleteOne(url, thatButton){
 
-
-  // we just show wait image before ajax
-  var $thatButton = $(thatButton)
-  var alreadyWaiting = $thatButton.has($('.wait-img-active')).length
-
-  if (! alreadyWaiting) {
-    var previousButtonContent = $thatButton.html()
-    var availableWidth = $thatButton.width()
-    var $myWaitImg = $('#wait-img').clone()
-    $myWaitImg.attr("id", null)
-              .attr("class","wait-img-active pull-right")
-              .width(availableWidth)
-              .css("display", "block") ;
-    $thatButton.append($myWaitImg)
-  }
-  else {
-    // uncomment if user should stop clicking ;)
-    // $thatButton.addClass("btn-danger")
-
-    // uncomment to prevent a 2nd ajax
-    return false
+  console.warn("thatButton",thatButton)
+
+  if (typeof thatButton != 'undefined' && thatButton.id) {
+    // we just show wait image before ajax
+    var $thatButton = $(thatButton)
+    var alreadyWaiting = $thatButton.has($('.wait-img-active')).length
+
+
+    if (! alreadyWaiting ) {
+      var previousButtonContent = $thatButton.html()
+      var availableWidth = $thatButton.width()
+      var $myWaitImg = $('#wait-img').clone()
+      $myWaitImg.attr("id", null)
+                .attr("class","wait-img-active pull-right")
+                .width(availableWidth)
+                .css("display", "block") ;
+      $thatButton.append($myWaitImg)
+    }
   }
 
   // now the real ajax