Skip to content

Commit ff054d7

Browse files
committed
fix(members): follow GitHub "next" links
Ensure that we display all the public members of the Cloudflare org by following GitHub's "next" relative links for pagination.
1 parent ea35737 commit ff054d7

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

static/javascripts/script.js

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,19 +307,27 @@
307307
$item.appendTo('#members');
308308
}
309309

310-
function addMembers(){
311-
$.getJSON('https://api.github.com/orgs/cloudflare/members?callback=?', function (result) {
310+
function addMembers( count, url ){
311+
$.getJSON(url + '&callback=?', function (result) {
312312
// API Rate limiting catch
313313
if( result.data && result.data.message ){ return; }
314314

315315
var members = result.data;
316-
$('#member-count').text(members.length).removeClass('loading');
316+
count += members.length;
317+
$('#member-count').text(count).removeClass('loading');
317318
$.each( members, function(idx, member){ addMember( member ); });
319+
320+
$.each(result.meta.Link, function (idx, link) {
321+
if (link[1].rel === 'next') {
322+
addMembers( count, link[0] )
323+
return false; // short-circuit $.each
324+
}
325+
});
318326
});
319327
}
320328

321329
addRepos(customRepos);
322-
addMembers();
330+
addMembers(0, 'https://api.github.com/orgs/cloudflare/members?page=1');
323331

324332
$('#activate-mobile-menu').on('click', function( evt ){
325333
evt.preventDefault();

0 commit comments

Comments
 (0)