Skip to content

Commit 6596716

Browse files
committed
rebuild for v1.1.1
1 parent cc8ad54 commit 6596716

File tree

4 files changed

+44
-4
lines changed

4 files changed

+44
-4
lines changed

dist/angular-dimple.js

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! Angular-Dimple - 1.1.0 - 2014-09-17
1+
/*! Angular-Dimple - 1.1.1 - 2014-09-18
22
* https://github.com/esripdx/angular-dimple
33
* Licensed ISC */
44
angular.module('angular-dimple', [
@@ -441,6 +441,11 @@ angular.module('angular-dimple.x', [])
441441
x = chart.addMeasureAxis('x', [$attrs.groupBy, $attrs.field]);
442442
} else if ($attrs.type == 'Percent') {
443443
x = chart.addPctAxis('x', $attrs.field);
444+
} else if ($attrs.type == 'Time') {
445+
x = chart.addTimeAxis('x', $attrs.field);
446+
if ($attrs.format) {
447+
x.tickFormat = $attrs.format;
448+
}
444449
} else {
445450
x = chart.addCategoryAxis('x', [$attrs.groupBy, $attrs.field]);
446451
}
@@ -452,6 +457,11 @@ angular.module('angular-dimple.x', [])
452457
x = chart.addMeasureAxis('x', $attrs.field);
453458
} else if ($attrs.type == 'Percent') {
454459
x = chart.addPctAxis('x', $attrs.field);
460+
} else if ($attrs.type == 'Time') {
461+
x = chart.addTimeAxis('x', $attrs.field);
462+
if ($attrs.format) {
463+
x.tickFormat = $attrs.format;
464+
}
455465
} else {
456466
x = chart.addCategoryAxis('x', $attrs.field);
457467
}
@@ -494,6 +504,11 @@ angular.module('angular-dimple.y', [])
494504
y = chart.addCategoryAxis('y', $attrs.field);
495505
} else if ($attrs.type == 'Percent') {
496506
y = chart.addPctAxis('y', $attrs.field);
507+
} else if ($attrs.type == 'Time') {
508+
y = chart.addTimeAxis('x', $attrs.field);
509+
if ($attrs.format) {
510+
y.tickFormat = $attrs.format;
511+
}
497512
} else {
498513
y = chart.addMeasureAxis('y', $attrs.field);
499514
}
@@ -505,6 +520,11 @@ angular.module('angular-dimple.y', [])
505520
y = chart.addCategoryAxis('y', $attrs.field);
506521
} else if ($attrs.type == 'Percent') {
507522
y = chart.addPctAxis('y', $attrs.field);
523+
} else if ($attrs.type == 'Time') {
524+
y = chart.addTimeAxis('x', $attrs.field);
525+
if ($attrs.format) {
526+
y.tickFormat = $attrs.format;
527+
}
508528
} else {
509529
y = chart.addMeasureAxis('y', $attrs.field);
510530
}

dist/angular-dimple.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.

site/js/lib/angular-dimple.js

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! Angular-Dimple - 1.1.0 - 2014-09-17
1+
/*! Angular-Dimple - 1.1.1 - 2014-09-18
22
* https://github.com/esripdx/angular-dimple
33
* Licensed ISC */
44
angular.module('angular-dimple', [
@@ -441,6 +441,11 @@ angular.module('angular-dimple.x', [])
441441
x = chart.addMeasureAxis('x', [$attrs.groupBy, $attrs.field]);
442442
} else if ($attrs.type == 'Percent') {
443443
x = chart.addPctAxis('x', $attrs.field);
444+
} else if ($attrs.type == 'Time') {
445+
x = chart.addTimeAxis('x', $attrs.field);
446+
if ($attrs.format) {
447+
x.tickFormat = $attrs.format;
448+
}
444449
} else {
445450
x = chart.addCategoryAxis('x', [$attrs.groupBy, $attrs.field]);
446451
}
@@ -452,6 +457,11 @@ angular.module('angular-dimple.x', [])
452457
x = chart.addMeasureAxis('x', $attrs.field);
453458
} else if ($attrs.type == 'Percent') {
454459
x = chart.addPctAxis('x', $attrs.field);
460+
} else if ($attrs.type == 'Time') {
461+
x = chart.addTimeAxis('x', $attrs.field);
462+
if ($attrs.format) {
463+
x.tickFormat = $attrs.format;
464+
}
455465
} else {
456466
x = chart.addCategoryAxis('x', $attrs.field);
457467
}
@@ -494,6 +504,11 @@ angular.module('angular-dimple.y', [])
494504
y = chart.addCategoryAxis('y', $attrs.field);
495505
} else if ($attrs.type == 'Percent') {
496506
y = chart.addPctAxis('y', $attrs.field);
507+
} else if ($attrs.type == 'Time') {
508+
y = chart.addTimeAxis('x', $attrs.field);
509+
if ($attrs.format) {
510+
y.tickFormat = $attrs.format;
511+
}
497512
} else {
498513
y = chart.addMeasureAxis('y', $attrs.field);
499514
}
@@ -505,6 +520,11 @@ angular.module('angular-dimple.y', [])
505520
y = chart.addCategoryAxis('y', $attrs.field);
506521
} else if ($attrs.type == 'Percent') {
507522
y = chart.addPctAxis('y', $attrs.field);
523+
} else if ($attrs.type == 'Time') {
524+
y = chart.addTimeAxis('x', $attrs.field);
525+
if ($attrs.format) {
526+
y.tickFormat = $attrs.format;
527+
}
508528
} else {
509529
y = chart.addMeasureAxis('y', $attrs.field);
510530
}

0 commit comments

Comments
 (0)