From a0e1ebae12a08d65bcd4e487616be2ef41d5bb8c Mon Sep 17 00:00:00 2001 From: Rishav Agarwal Date: Wed, 1 Mar 2017 17:29:01 +0530 Subject: [PATCH 1/2] Added identifier for package nodes --- assets/js/scancode.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/assets/js/scancode.js b/assets/js/scancode.js index 0581aff8..b9108fbe 100644 --- a/assets/js/scancode.js +++ b/assets/js/scancode.js @@ -174,7 +174,11 @@ $(document).ready(function () { .text(function (d,i,j) { var data = newClueNodes[j].parentNode.__data__; if (d === 'filename') { - return data.name + var isPackage = "" + if(data.scanData.packages.length > 0){ + isPackage = " (P)" + } + return data.name + isPackage } else if (d === 'license') { return $.map(data.scanData.licenses, function(license, i) { return license.short_name; @@ -418,4 +422,4 @@ $(document).ready(function () { // Make node view modal box draggable $("#nodeModal").draggable({ handle: ".modal-header" }); -}); \ No newline at end of file +}); From bb593f4c180f865678ba0c101e797c7a09f6985c Mon Sep 17 00:00:00 2001 From: Rishav Agarwal Date: Wed, 1 Mar 2017 23:34:43 +0530 Subject: [PATCH 2/2] Text-background color of packages changed to green as identifier --- assets/css/main.css | 6 +++++- assets/js/scancode.js | 13 +++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/assets/css/main.css b/assets/css/main.css index 0a6cd147..e504bbf4 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -64,6 +64,10 @@ body { stroke: gray; } +.package rect { + fill:green; + stroke:green; +} .clue-license rect { fill: #3984b6; stroke: #3984b6; @@ -182,4 +186,4 @@ div.dataTables_scrollHead th:first-child { /*For rounded table border*/ width: 75%; height: 75%; padding: 10px 0; -} \ No newline at end of file +} diff --git a/assets/js/scancode.js b/assets/js/scancode.js index b9108fbe..4ecb44f9 100644 --- a/assets/js/scancode.js +++ b/assets/js/scancode.js @@ -164,7 +164,12 @@ $(document).ready(function () { .append("g") .attr("class", function (d) { return "clue-" + d; }) .style("opacity", 0); - + var packageNodes = fileNodes.filter(function(d) { + return d.scanData.packages.length > 0 + }) + packageNodes + .selectAll(".clue-filename") + .attr("class","clue-filename package") // Append clue rect var newRectNode = newClueNodes.append("rect"); @@ -174,11 +179,7 @@ $(document).ready(function () { .text(function (d,i,j) { var data = newClueNodes[j].parentNode.__data__; if (d === 'filename') { - var isPackage = "" - if(data.scanData.packages.length > 0){ - isPackage = " (P)" - } - return data.name + isPackage + return data.name } else if (d === 'license') { return $.map(data.scanData.licenses, function(license, i) { return license.short_name;