diff options
| author | Simon Knox <psimyn@gmail.com> | 2017-02-27 13:05:50 +1100 |
|---|---|---|
| committer | Simon Knox <psimyn@gmail.com> | 2017-03-09 07:32:34 +1100 |
| commit | 08c141b954af5d83cffe9891ff0d8f62c646ae34 (patch) | |
| tree | ab1bbe5abf020d9f58745ff0ae219c6287721cb1 /app | |
| parent | a57a0e3d606c80fbcecd126148631dabbd44347b (diff) | |
| download | gitlab-ce-08c141b954af5d83cffe9891ff0d8f62c646ae34.tar.gz | |
respect offset and limit query params for infinite lists28030-infinite-offset
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/lib/utils/url_utility.js | 7 | ||||
| -rw-r--r-- | app/assets/javascripts/pager.js | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js index 1bc81d2e4a4..09c4261b318 100644 --- a/app/assets/javascripts/lib/utils/url_utility.js +++ b/app/assets/javascripts/lib/utils/url_utility.js @@ -66,6 +66,13 @@ return results; })()).join('&'); }; + w.gl.utils.removeParams = (params) => { + const url = new URL(window.location.href); + params.forEach((param) => { + url.search = w.gl.utils.removeParamQueryString(url.search, param); + }); + return url.href; + }; w.gl.utils.getLocationHash = function(url) { var hashIndex; if (typeof url === 'undefined') { diff --git a/app/assets/javascripts/pager.js b/app/assets/javascripts/pager.js index e35cf6d295e..5f6bc902cf8 100644 --- a/app/assets/javascripts/pager.js +++ b/app/assets/javascripts/pager.js @@ -1,11 +1,15 @@ +require('~/lib/utils/common_utils'); +require('~/lib/utils/url_utility'); + (() => { const ENDLESS_SCROLL_BOTTOM_PX = 400; const ENDLESS_SCROLL_FIRE_DELAY_MS = 1000; const Pager = { init(limit = 0, preload = false, disable = false, callback = $.noop) { + this.url = $('.content_list').data('href') || gl.utils.removeParams(['limit', 'offset']); this.limit = limit; - this.offset = this.limit; + this.offset = parseInt(gl.utils.getParameterByName('offset'), 10) || this.limit; this.disable = disable; this.callback = callback; this.loading = $('.loading').first(); @@ -20,7 +24,7 @@ this.loading.show(); $.ajax({ type: 'GET', - url: $('.content_list').data('href') || window.location.href, + url: this.url, data: `limit=${this.limit}&offset=${this.offset}`, dataType: 'json', error: () => this.loading.hide(), |