blob42/nvd3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing merge conflict

Browse Source
This commit is contained in:
Bob Monteverde 2012-08-03 13:18:04 -04:00
commit ad622bb512
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nv.d3.js
View File

@ -5362,6 +5362,7 @@ nv.models.multiBarHorizontalChart = function() {
color = nv.utils.defaultColor(),
showControls = true,
showLegend = true,
stacked = false,
tooltips = true,
tooltip = function(key, x, y, e, graph) {
return '<h3>' + key + " - " + x + '</h3>' +
@ -5371,7 +5372,7 @@ nv.models.multiBarHorizontalChart = function() {
;
var multibar = nv.models.multiBarHorizontal().stacked(false),
var multibar = nv.models.multiBarHorizontal().stacked(stacked),
x = multibar.xScale(),
y = multibar.yScale(),
xAxis = nv.models.axis().scale(x).orient('left').highlightZero(false).showMaxMin(false),
@ -5592,7 +5593,7 @@ nv.models.multiBarHorizontalChart = function() {
chart.xAxis = xAxis;
chart.yAxis = yAxis;
d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'clipEdge', 'id', 'delay', 'showValues', 'valueFormat');
d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'clipEdge', 'id', 'delay', 'showValues', 'valueFormat', 'stacked');
chart.margin = function(_) {

4
nv.d3.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
src/models/multiBarHorizontalChart.js
View File

@ -6,6 +6,7 @@ nv.models.multiBarHorizontalChart = function() {
color = nv.utils.defaultColor(),
showControls = true,
showLegend = true,
stacked = false,
tooltips = true,
tooltip = function(key, x, y, e, graph) {
return '<h3>' + key + " - " + x + '</h3>' +
@ -15,7 +16,7 @@ nv.models.multiBarHorizontalChart = function() {
;
var multibar = nv.models.multiBarHorizontal().stacked(false),
var multibar = nv.models.multiBarHorizontal().stacked(stacked),
x = multibar.xScale(),
y = multibar.yScale(),
xAxis = nv.models.axis().scale(x).orient('left').highlightZero(false).showMaxMin(false),
@ -236,7 +237,7 @@ nv.models.multiBarHorizontalChart = function() {
chart.xAxis = xAxis;
chart.yAxis = yAxis;
d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'clipEdge', 'id', 'delay', 'showValues', 'valueFormat');
d3.rebind(chart, multibar, 'x', 'y', 'xDomain', 'yDomain', 'forceX', 'forceY', 'clipEdge', 'id', 'delay', 'showValues', 'valueFormat', 'stacked');
chart.margin = function(_) {