Browse Source

[search] Fixed onClick event of growingMultibarChart

Enrico Berti 11 years ago
parent
commit
e6b56e24b4

+ 1 - 0
apps/search/src/search/templates/search2.mako

@@ -666,6 +666,7 @@ ${ commonheader(_('Search'), "search", user, "80px") | n,unicode }
     <div data-bind="timelineChart: {datum: {counts: counts, extraSeries: extraSeries, widget_id: $parent.id(), label: label}, stacked: $root.collection.getFacetById($parent.id()).properties.stacked(), field: field, label: label, transformer: timelineChartDataTransformer,
       onSelectRange: function(from, to){ viewModel.collection.selectTimelineFacet({from: from, to: to, cat: field, widget_id: $parent.id()}) },
       onStateChange: function(state){ $root.collection.getFacetById($parent.id()).properties.stacked(state.stacked); },
+      onClick: function(d){console.log(d)},
       onComplete: function(){ viewModel.getWidgetById(id).isLoading(false) }}" />
   </div>
   <!-- /ko -->

+ 7 - 7
apps/search/static/js/charts.ko.js

@@ -258,9 +258,9 @@ function lineChart(element, options) {
     return _chart;
   }, function () {
     d3.selectAll(".nv-bar").on('click',
-        function (d, i) {
-          options.onClick(d);
-        });
+      function (d, i) {
+        options.onClick(d);
+      });
   });
 
 }
@@ -343,10 +343,10 @@ function barChart(element, options, isTimeline) {
 
     return _chart;
   }, function () {
-    d3.selectAll(".nv-bar").on('click',
-        function (d, i) {
-          options.onClick(d);
-        });
+    d3.selectAll(".nv-bar").on("click",
+      function (d, i) {
+        options.onClick(d);
+      });
   });
 
 }

+ 0 - 2
apps/search/static/js/nv.d3.growingDiscreteBar.js

@@ -180,8 +180,6 @@ nv.models.growingDiscreteBar = function() {
             });
           })
           .on('click', function(d,i) {
-            console.log(d);
-            console.log(i);
             dispatch.elementClick({
               value: getY(d,i),
               point: d,

+ 2 - 1
apps/search/static/js/nv.d3.growingMultiBar.js

@@ -229,7 +229,8 @@ nv.models.growingMultiBar = function() {
           ;
       bars
           .style('fill', function(d,i,j){ return color(d, j, i);  })
-          .style('stroke', function(d,i,j){ return color(d, j, i); })
+          .style('stroke', function(d,i,j){ return color(d, j, i); });
+      barsEnter
           .on('mouseover', function(d,i) { //TODO: figure out why j works above, but not here
             d3.select(this).classed('hover', true);
             if (stacked){

+ 3 - 1
apps/search/static/js/search.ko.js

@@ -994,7 +994,9 @@ var SearchViewModel = function (collection_json, query_json, initial_json) {
       if (data.status == 0) {
         self.collection.id = data.id;
         $(document).trigger("info", data.message);
-        window.location.hash = '#collection=' + data.id;
+        if (window.location.search.indexOf("collection") == -1){
+          window.location.hash = '#collection=' + data.id;
+        }
       }
       else {
         $(document).trigger("error", data.message);