Fix infinite content ajax call parameters

- Ajax request could end up in a 404 if the page URL didn't have at least a query string parameter

diff --git a/view/js/main.js b/view/js/main.js
index 2e665d1000bad355e95bfaadaf9c81ed6a5fec98..175f68ca638ca3a4f2e905ef70dcb3a215a3cf3d 100644 (file)
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -893,16 +893,29 @@ function loadScrollContent() {
 
        // get the raw content from the next page and insert this content
        // right before "#conversation-end"
-       $.get(infinite_scroll.reload_uri + '&mode=raw&last_received=' + received + '&last_commented=' + commented + '&last_created=' + created + '&last_uriid=' + uriid, function(data) {
+       $.get({
+               url: infinite_scroll.reload_uri,
+               data: {
+                       'mode'          : 'raw',
+                       'last_received' : received,
+                       'last_commented': commented,
+                       'last_created'  : created,
+                       'last_uriid'    : uriid
+               }
+       })
+       .done(function(data) {
                $("#scroll-loader").hide();
                if ($(data).length > 0) {
                        $(data).insertBefore('#conversation-end');
-                       lockLoadContent = false;
                } else {
                        $("#scroll-end").fadeIn('normal');
                }
 
                document.dispatchEvent(new Event('postprocess_liveupdate'));
+       })
+       .always(function () {
+               $("#scroll-loader").hide();
+               lockLoadContent = false;
        });
 }