diff --git a/js/search.js b/js/search.js index b6aeb90840bf2eb8b0d851f1a0cab8132ba66281..ef1cdc9c847fab1aa70dbf018cf632c6ab1471dd 100644 --- a/js/search.js +++ b/js/search.js @@ -28,10 +28,10 @@ function Search() { container.select("input") .on("keyup", function(s){ var value = container.select("input").node().value - if(value === ""){ + // if(value === ""){ - } - if(value.length < 3) return + // } + // if(value.length < 3) return debounced(value) }) } diff --git a/js/tags.js b/js/tags.js index 452f9eca22ff16144071455fd61a60e26b2f9424..ff120ab7d27c16aba116992271aade0a7ec9612c 100644 --- a/js/tags.js +++ b/js/tags.js @@ -72,7 +72,7 @@ function myTagCloud() { else d.active = (matches.length == filterWords.length && search); }); - var anzahl = data.filter(function(d){ return d.active; }).length; + // var anzahl = data.filter(function(d){ return d.active; }).length; // c("anzahl", anzahl) } @@ -308,105 +308,11 @@ function myTagCloud() { chart.search = function(query){ state.search = query - - if(query === "") { - console.log("reset") - chart.filter(filterWords, true); - chart.update(); - list.highlight(); - list.project() - return - } - - console.log(query) - - var sliceNum = parseInt(sliceScale(width)); - - var keywords2 = []; - - data.forEach(function(d) { - var active = d.search.toUpperCase().indexOf(query) > -1 - d.active = active - d.highlight = active - - if(active){ - d.keywords.forEach(function(keyword) { - keywords2.push({ keyword: keyword, data: d }); - }) - - } - }); - - var result = d3.nest() - .key(function(d) { return d.keyword; }) - .rollup(function(d){ - return d.map(function(d){ return d.data; }); - }) - .entries(keywords2) - .sort(function(a,b){ - return b.values.length - a.values.length; - }) - .slice(0,sliceNum) - .sort(function(a,b){ - return d3.ascending(a.key[0], b.key[0]); - }) - - // var result = keywordsNestGlobal - // .filter(function(d){ - // return d.key.toUpperCase().indexOf(query) > -1; - // }) - // .slice(0,sliceNum) - // .sort(function(a,b){ - // return d3.ascending(a.key[0], b.key[0]); - // }) - - // console.log(result) - - - // c("num",sliceNum) - var keywordsExtent = d3.extent(result, function (d) { - return d.values.length; - }) - keywordsScale - .domain(keywordsExtent) - .range([10,20]); - - if(keywordsExtent[0]==keywordsExtent[1]) keywordsScale.range([15,15]) - - - keywordsOpacityScale - .domain(keywordsExtent) - .range([0.2,1]); - - listLayout(result); - - // var p = 10; - // var x0 = 0; - // result.forEach(function(d){ - // d.x = x0; - // x0 += keywordsScale(d.values.length) + p; - // }) - - chart.draw(result) - - // var words = result.map(function(d){ return d.key; }); - - // data.forEach(function(d) { - // var matches = words.filter(function(word){ - // return d.keywords.indexOf(word) > -1; - // }); - // d.active = matches.length > 0; - // d.highlight = matches.length > 0; - // }); - - // c(words); - - // list.highlight(); + chart.filter(filterWords, true); + chart.update(); list.highlight(); - // list.split(); list.project() - } chart.mouseenterCallback = function(callback){