Merge pull request #2763 from phenotips/PT-3872

PT-3872: Sometimes livetable's "Loading" animation disapears before the data is actualy loaded
phenotips · Nov 3, 2018 · d9d3b0f · d9d3b0f
2 parents 4facf0d + 84d22a2
commit d9d3b0f
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/components/base-war/src/main/webapp/resources/js/xwiki/table/livetable.js b/components/base-war/src/main/webapp/resources/js/xwiki/table/livetable.js
@@ -181,6 +181,10 @@ XWiki.widgets.LiveTable = Class.create({
       {
         method: 'get',
         onComplete: function( transport ) {
+          if (transport.responseJSON && transport.responseJSON.reqNo < self.sendReqNo) {
+            // Results for a previous request, still waiting for the most recent request to complete
+            return;
+          }
           // Let code know loading is finished
           // 1. Named event (for code interested by that table only)
           document.fire("xwiki:livetable:" + self.domNodeName + ":loadingComplete", {