Merge pull request #34 from paulcpederson/master

build for v1.1.1
paulcpederson · Sep 18, 2014 · f51b8e7 · f51b8e7
2 parents cc8ad54 + a298ab6
commit f51b8e7
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 5 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-dimple",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "main": "dist/angular-dimple.js",
   "homepage": "http://esripdx.github.io/angular-dimple/",
   "authors": [

diff --git a/dist/angular-dimple.js b/dist/angular-dimple.js
@@ -1,4 +1,4 @@
-/*! Angular-Dimple - 1.1.0 - 2014-09-17
+/*! Angular-Dimple - 1.1.1 - 2014-09-18
 *   https://github.com/esripdx/angular-dimple
 *   Licensed ISC */
 angular.module('angular-dimple', [
@@ -441,6 +441,11 @@ angular.module('angular-dimple.x', [])
             x = chart.addMeasureAxis('x', [$attrs.groupBy, $attrs.field]);
           } else if ($attrs.type == 'Percent') {
             x = chart.addPctAxis('x', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            x = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              x.tickFormat = $attrs.format;
+            }
           } else {
             x = chart.addCategoryAxis('x', [$attrs.groupBy, $attrs.field]);
           }
@@ -452,6 +457,11 @@ angular.module('angular-dimple.x', [])
             x = chart.addMeasureAxis('x', $attrs.field);
           } else if ($attrs.type == 'Percent') {
             x = chart.addPctAxis('x', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            x = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              x.tickFormat = $attrs.format;
+            }
           } else {
             x = chart.addCategoryAxis('x', $attrs.field);
           }
@@ -494,6 +504,11 @@ angular.module('angular-dimple.y', [])
             y = chart.addCategoryAxis('y', $attrs.field);
           } else if ($attrs.type == 'Percent') {
             y = chart.addPctAxis('y', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            y = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              y.tickFormat = $attrs.format;
+            }
           } else {
             y = chart.addMeasureAxis('y', $attrs.field);
           }
@@ -505,6 +520,11 @@ angular.module('angular-dimple.y', [])
             y = chart.addCategoryAxis('y', $attrs.field);
           } else if ($attrs.type == 'Percent') {
             y = chart.addPctAxis('y', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            y = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              y.tickFormat = $attrs.format;
+            }
           } else {
             y = chart.addMeasureAxis('y', $attrs.field);
           }

diff --git a/dist/angular-dimple.min.js b/dist/angular-dimple.min.js
diff --git a/site/js/lib/angular-dimple.js b/site/js/lib/angular-dimple.js
@@ -1,4 +1,4 @@
-/*! Angular-Dimple - 1.1.0 - 2014-09-17
+/*! Angular-Dimple - 1.1.1 - 2014-09-18
 *   https://github.com/esripdx/angular-dimple
 *   Licensed ISC */
 angular.module('angular-dimple', [
@@ -441,6 +441,11 @@ angular.module('angular-dimple.x', [])
             x = chart.addMeasureAxis('x', [$attrs.groupBy, $attrs.field]);
           } else if ($attrs.type == 'Percent') {
             x = chart.addPctAxis('x', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            x = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              x.tickFormat = $attrs.format;
+            }
           } else {
             x = chart.addCategoryAxis('x', [$attrs.groupBy, $attrs.field]);
           }
@@ -452,6 +457,11 @@ angular.module('angular-dimple.x', [])
             x = chart.addMeasureAxis('x', $attrs.field);
           } else if ($attrs.type == 'Percent') {
             x = chart.addPctAxis('x', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            x = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              x.tickFormat = $attrs.format;
+            }
           } else {
             x = chart.addCategoryAxis('x', $attrs.field);
           }
@@ -494,6 +504,11 @@ angular.module('angular-dimple.y', [])
             y = chart.addCategoryAxis('y', $attrs.field);
           } else if ($attrs.type == 'Percent') {
             y = chart.addPctAxis('y', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            y = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              y.tickFormat = $attrs.format;
+            }
           } else {
             y = chart.addMeasureAxis('y', $attrs.field);
           }
@@ -505,6 +520,11 @@ angular.module('angular-dimple.y', [])
             y = chart.addCategoryAxis('y', $attrs.field);
           } else if ($attrs.type == 'Percent') {
             y = chart.addPctAxis('y', $attrs.field);
+          } else if ($attrs.type == 'Time') {
+            y = chart.addTimeAxis('x', $attrs.field);
+            if ($attrs.format) {
+              y.tickFormat = $attrs.format;
+            }
           } else {
             y = chart.addMeasureAxis('y', $attrs.field);
           }