Merge pull request #31 from anwfr/feature-xAxis-time

Added feature: xAxis.time

Author: ngyewch

rickshaw.js

@@ -136,21 +136,29 @@ angular.module('angular-rickshaw', [])
 
                         if (scope.features) {
                             if (scope.features.xAxis) {
-                                var xAxisConfig = {
-                                    graph: graph
-                                };
-                                if (scope.features.xAxis.timeUnit) {
-                                    var time = new Rickshaw.Fixtures.Time();
-                                    xAxisConfig.timeUnit = time.unit(scope.features.xAxis.timeUnit);
-                                }
-                                if (scope.features.xAxis.tickFormat) {
-                                    xAxisConfig.tickFormat = scope.features.xAxis.tickFormat;
-                                }
-                                if (scope.features.xAxis.ticksTreatment) {
-                                    xAxisConfig.ticksTreatment = scope.features.xAxis.ticksTreatment;
-                                }
                                 if (!xAxis) {
-                                    xAxis = new Rickshaw.Graph.Axis.X(xAxisConfig);
+                                    var xAxisConfig = {
+                                        graph: graph
+                                    };
+                                    if (scope.features.xAxis.timeUnit) {
+                                        var time = new Rickshaw.Fixtures.Time();
+                                        xAxisConfig.timeUnit = time.unit(scope.features.xAxis.timeUnit);
+                                    }
+                                    if (scope.features.xAxis.tickFormat) {
+                                        xAxisConfig.tickFormat = scope.features.xAxis.tickFormat;
+                                    }
+                                    if (scope.features.xAxis.ticksTreatment) {
+                                        xAxisConfig.ticksTreatment = scope.features.xAxis.ticksTreatment;
+                                    }
+                                    if (scope.features.xAxis.time) {
+                                        if (scope.features.xAxis.time.local) {
+                                            xAxisConfig.timeFixture = new Rickshaw.Fixtures.Time.Local();
+                                        }
+                                        xAxis = new Rickshaw.Graph.Axis.Time(xAxisConfig);
+                                    }
+                                    else {
+                                        xAxis = new Rickshaw.Graph.Axis.X(xAxisConfig);
+                                    }
                                     xAxis.render();
                                 }
                                 else {