Skip to content

Commit

Permalink
Merge 65fa804 into 2e67788
Browse files Browse the repository at this point in the history
  • Loading branch information
emikil committed Dec 15, 2014
2 parents 2e67788 + 65fa804 commit 1f339be
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions nvd3/NVD3Chart.py
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,8 @@ def add_serie(self, y, x, name=None, extra=None, **kwargs):
if self.model != 'pieChart':
_start = extra['tooltip']['y_start']
_end = extra['tooltip']['y_end']
_start = ("'" + str(_start) + "' + ") if _start else ''
_end = (" + '" + str(_end) + "'") if _end else ''
_start = ("'" + unicode(_start) + "' + ") if _start else ''
_end = (" + '" + unicode(_end) + "'") if _end else ''

if self.model == 'linePlusBarChart' or self.model == 'linePlusBarWithFocusChart':
if self.tooltip_condition_string:
Expand All @@ -278,8 +278,8 @@ def add_serie(self, y, x, name=None, extra=None, **kwargs):
if self.model == 'pieChart':
_start = extra['tooltip']['y_start']
_end = extra['tooltip']['y_end']
_start = ("'" + str(_start) + "' + ") if _start else ''
_end = (" + '" + str(_end) + "'") if _end else ''
_start = ("'" + unicode(_start) + "' + ") if _start else ''
_end = (" + '" + unicode(_end) + "'") if _end else ''
self.tooltip_condition_string += "var y = " + _start + " String(y) " + _end + ";\n"

#Increment series counter & append
Expand Down

0 comments on commit 1f339be

Please sign in to comment.