From 349798ede4f86af912baf01de580beb91f81dab3 Mon Sep 17 00:00:00 2001 From: christine_lu Date: Fri, 17 Apr 2015 19:01:15 -0400 Subject: [PATCH] modified to add dynamically changing y axis label --- dist/angularjs-nvd3-directives.js | 8 ++++---- src/directives/nvD3AxisConfiguration.js | 2 +- src/directives/nvd3Directives.js | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dist/angularjs-nvd3-directives.js b/dist/angularjs-nvd3-directives.js index 0ae1060..a5ddbb3 100644 --- a/dist/angularjs-nvd3-directives.js +++ b/dist/angularjs-nvd3-directives.js @@ -1,4 +1,4 @@ -/*! angularjs-nvd3-directives - v0.0.8 - 2015-04-03 +/*! angularjs-nvd3-directives - v0.0.8 - 2015-04-17 * http://angularjs-nvd3-directives.github.io/angularjs-nvd3-directives * Copyright (c) 2015 Christian Maurer; Licensed Apache License, v2.0 */ (function() { @@ -605,7 +605,7 @@ function configureYaxis (chart, scope, attrs) { chart.yAxis.tickFormat(scope.yaxistickformat()); } if (attrs.yaxislabel) { - chart.yAxis.axisLabel(attrs.yaxislabel); + chart.yAxis.axisLabel(scope.yaxislabel); } if (attrs.yaxisscale) { chart.yAxis.scale(scope.yaxisscale()); @@ -784,7 +784,7 @@ function configureY2axis (chart, scope, attrs) { } } function initializeMargin(scope, attrs){ - var margin = (scope.$eval(attrs.margin) || {left: 50, top: 50, bottom: 50, right: 50}); + var margin = (scope.$eval(attrs.margin) || {left: 100, top: 50, bottom: 50, right: 50}); if (typeof(margin) !== 'object') { // we were passed a vanilla int, convert to full margin object margin = {left: margin, top: margin, bottom: margin, right: margin}; @@ -1424,7 +1424,7 @@ function initializeMargin(scope, attrs){ yaxisticksize: '&', yaxistickpadding: '&', yaxistickformat: '&', - yaxislabel: '@', + yaxislabel: '=', yaxisscale: '&', yaxisdomain: '&', yaxisrange: '&', diff --git a/src/directives/nvD3AxisConfiguration.js b/src/directives/nvD3AxisConfiguration.js index 808aa7a..6eb845c 100644 --- a/src/directives/nvD3AxisConfiguration.js +++ b/src/directives/nvD3AxisConfiguration.js @@ -169,7 +169,7 @@ function configureYaxis (chart, scope, attrs) { chart.yAxis.tickFormat(scope.yaxistickformat()); } if (attrs.yaxislabel) { - chart.yAxis.axisLabel(attrs.yaxislabel); + chart.yAxis.axisLabel(scope.yaxislabel); } if (attrs.yaxisscale) { chart.yAxis.scale(scope.yaxisscale()); diff --git a/src/directives/nvd3Directives.js b/src/directives/nvd3Directives.js index e189594..234d482 100644 --- a/src/directives/nvd3Directives.js +++ b/src/directives/nvd3Directives.js @@ -644,7 +644,7 @@ yaxisticksize: '&', yaxistickpadding: '&', yaxistickformat: '&', - yaxislabel: '@', + yaxislabel: '=', yaxisscale: '&', yaxisdomain: '&', yaxisrange: '&',