From 31cc080157e99d503c28b2346f7124ad8f4e33d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Ca=C3=B1as=20D=C3=ADaz?= Date: Sat, 11 Oct 2014 13:02:13 +0200 Subject: [PATCH] Top 10 companies links list supports now newest format of scm-companies.json Change-Id: I40fa2b4ea3ea1681b5e71963afe33f50fa1a0167 --- browser/lib/openstack.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/browser/lib/openstack.js b/browser/lib/openstack.js index 11621070..6b83359b 100644 --- a/browser/lib/openstack.js +++ b/browser/lib/openstack.js @@ -37,15 +37,27 @@ var Openstack = {}; $.getJSON(json_file, null, function(data) { var count = 0; - var links = ""; + var links = "   "; + + /* + Workaround here: + to scm-companies.json formats are available. Newest returns + an object, older just an array. For this feature we need an array + */ + + if (!(data instanceof Array)){ + if (data.hasOwnProperty('name')) + data = data.name; + } $.each(data, function(index, company) { if (count == 10) return false; if (company === "Others") return true; if (company.match("^\-")) return true; - link = '' + company + ' | '; + position = count +1; + link = '#'+position +' ' + company + '   '; links = links + link; ++count; @@ -68,8 +80,8 @@ var Openstack = {}; $.getJSON(json_file, null, function(data) { $.each(data, function(field, values) { if ($.inArray(field, marks) == -1) { - Openstack.addCompanyEvol(ds, field, metric, values); - } + Openstack.addCompanyEvol(ds, field, metric, values); + } else { Openstack.addDatesField(ds, field, values); } @@ -128,7 +140,7 @@ var Openstack = {}; Openstack.addDatesField = function(ds, field, values) { if (!Openstack.dates[ds]) Openstack.dates[ds] = {}; - Openstack.dates[ds][field] = values; + Openstack.dates[ds][field] = values; }; Openstack.addCompanyEvol = function(ds, name, field, values) {