Skip to content

Commit 9d8ee6f

Browse files
committed
Release v0.5.2
1 parent 8d508da commit 9d8ee6f

File tree

4 files changed

+27
-35
lines changed

4 files changed

+27
-35
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-graphs",
33
"description": "Angular directive for displaying charts implemented with D3",
4-
"version": "0.5.1",
4+
"version": "0.5.2",
55
"main": [
66
"dist/angular-graphs.js"
77
],

dist/angular-graphs.js

Lines changed: 24 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,26 @@ angular.module('picardy.graphs.bar', ['picardy.graphs.common'])
7575
});
7676
}
7777

78+
function getYRange () {
79+
var range;
80+
81+
if (options.max && options.max.y) {
82+
range = [0, options.max.y];
83+
} else {
84+
range = [0, d3.max(options.data, function (d) {
85+
return d.y;
86+
})];
87+
}
88+
89+
return range;
90+
}
91+
92+
function getXRange () {
93+
return options.data.map(function (d) {
94+
return d.x;
95+
});
96+
}
97+
7898
function drawYAxis (done) {
7999
var axisLength = options.height,
80100
yAxis, range;
@@ -83,27 +103,12 @@ angular.module('picardy.graphs.bar', ['picardy.graphs.common'])
83103
axisLength -= margin.info;
84104
axisLength -= margin.top;
85105
y = d3.scale.linear().range([axisLength, 0]);
86-
87-
if (options.max && options.max.y) {
88-
range = [0, options.max.y];
89-
} else {
90-
range = [0, d3.max(options.data, function (d) {
91-
return d.y;
92-
})];
93-
}
94-
106+
range = getYRange();
95107
y.domain(range);
96108
} else {
97109
axisLength -= margin.info + margin.label + 21;
98110
y = d3.scale.ordinal().rangeRoundBands([0, axisLength], 0.2);
99-
100-
if (options.max && options.max.y) {
101-
range = [0, options.max.y];
102-
} else {
103-
range = options.data.map(function (d) {
104-
return d.x;
105-
});
106-
}
111+
range = getXRange();
107112
y.domain(range);
108113
}
109114

@@ -147,24 +152,11 @@ angular.module('picardy.graphs.bar', ['picardy.graphs.common'])
147152
if (isVertical()) {
148153
axisLength -= margin.label + margin.yAxis;
149154
x = d3.scale.ordinal().rangeRoundBands([0, axisLength], 0.2);
150-
if (options.max && options.max.x) {
151-
range = [0, options.max.x];
152-
} else {
153-
range = options.data.map(function (d) {
154-
return d.x;
155-
});
156-
}
155+
range = getXRange();
157156
x.domain(range);
158157
} else {
159158
x = d3.scale.linear().range([axisLength, 0]);
160-
if (options.max && options.max.y) {
161-
range = [0, options.max.y];
162-
} else {
163-
range = [0, d3.max(options.data, function (d) {
164-
return d.y;
165-
})];
166-
}
167-
159+
range = getYRange();
168160
x.domain(range);
169161
}
170162

dist/angular-graphs.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)