Merge pull request #165 from eventualbuddha/nil-delegate-and-datasource-on-dealloc

Nil out delegate and datasource on dealloc

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v2.8.13](https://github.com/Jawbone/JBChartView/tree/v2.8.13) (2015-04-16)
+
+[Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.12...v2.8.13)
+
+**Fixed bugs:**
+
+- Wrong calculation of the lineIndex  [\#157](https://github.com/Jawbone/JBChartView/issues/157)
+
+**Closed issues:**
+
+- Swift round up for respondsToSelector\(\) and sizeWithFont\(\) [\#156](https://github.com/Jawbone/JBChartView/issues/156)
+
 ## [v2.8.12](https://github.com/Jawbone/JBChartView/tree/v2.8.12) (2015-04-13)
 
 [Full Changelog](https://github.com/Jawbone/JBChartView/compare/v2.8.11...v2.8.12)

Classes/JBLineChartView.m

@@ -312,6 +312,7 @@ static UIColor *kJBLineChartViewDefaultDotSelectionColor = nil;
         // Remove old line view
         if (self.linesView)
         {
+            self.linesView.delegate = nil;
             [self.linesView removeFromSuperview];
             self.linesView = nil;
         }
@@ -339,6 +340,7 @@ static UIColor *kJBLineChartViewDefaultDotSelectionColor = nil;
         // Remove old dot view
         if (self.dotsView)
         {
+            self.dotsView.delegate = nil;
             [self.dotsView removeFromSuperview];
             self.dotsView = nil;
         }

JBChartView.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "JBChartView"
-  s.version      = "2.8.12"
+  s.version      = "2.8.13"
   s.summary      = "Jawbone's iOS-based charting library for both line and bar graphs."
   s.homepage     = "https://github.com/Jawbone/JBChartView"
 
@@ -10,7 +10,7 @@ Pod::Spec.new do |s|
   s.author       = { "Terry Worona" => "tworona@jawbone.com" }
   s.source       = { 
 	:git => "https://github.com/Jawbone/JBChartView.git",
-	:tag => "v2.8.12"
+	:tag => "v2.8.13"
   }
 
   s.platform     = :ios, '6.0'

JBChartViewDemo/JBChartViewDemo/Controllers/Base/JBBaseTableViewController.m

@@ -28,6 +28,12 @@
     [self.view addSubview:self.tableView];
 }
 
+- (void)dealloc
+{
+    self.tableView.delegate = nil;
+    self.tableView.dataSource = nil;
+}
+
 #pragma mark - UITableViewDataSource
 
 - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section

JBChartViewDemo/JBChartViewDemo/Controllers/JBAreaChartViewController.m

@@ -84,6 +84,12 @@ NSString * const kJBAreaChartViewControllerNavButtonViewKey = @"view";
     return self;
 }
 
+- (void)dealloc
+{
+    _lineChartView.delegate = nil;
+    _lineChartView.dataSource = nil;
+}
+
 #pragma mark - Data
 
 - (void)initFakeData

JBChartViewDemo/JBChartViewDemo/Controllers/JBBarChartViewController.m

@@ -78,6 +78,12 @@ NSString * const kJBBarChartViewControllerNavButtonViewKey = @"view";
     return self;
 }
 
+- (void)dealloc
+{
+    _barChartView.delegate = nil;
+    _barChartView.dataSource = nil;
+}
+
 #pragma mark - Date
 
 - (void)initFakeData

JBChartViewDemo/JBChartViewDemo/Controllers/JBLineChartMissingPointsViewController.m

@@ -86,6 +86,12 @@ NSString * const kJBLineChartMissingPointsViewControllerNavButtonViewKey = @"vie
     return self;
 }
 
+- (void)dealloc
+{
+    _lineChartView.delegate = nil;
+    _lineChartView.dataSource = nil;
+}
+
 #pragma mark - Data
 
 - (void)initFakeData

JBChartViewDemo/JBChartViewDemo/Controllers/JBLineChartViewController.m

@@ -86,6 +86,12 @@ NSString * const kJBLineChartViewControllerNavButtonViewKey = @"view";
     return self;
 }
 
+- (void)dealloc
+{
+    _lineChartView.delegate = nil;
+    _lineChartView.dataSource = nil;
+}
+
 #pragma mark - Data
 
 - (void)initFakeData

README.md

@@ -72,6 +72,15 @@ To initialize a <i>JBBarChartView</i>, you only need a few lines of code (see be
     barChartView.dataSource = self;
     barChartView.delegate = self;
     [self addSubview:barChartView];
+
+Just like you would for a `UITableView`, ensure you clear these properties in your `dealloc`:
+
+	- (void)dealloc
+	{
+		JBBarChartView *barChartView = ...; // i.e. _barChartView
+		barChartView.delegate = nil;
+		barChartView.dataSource = nil;
+	}
     
 At a minimum, you need to inform the data source how many bars are in the chart:
 
@@ -99,9 +108,18 @@ Lastly, ensure you have set the *frame* of your barChartView & call *reloadData*
 Similiarily, to initialize a JBLineChartView, you only need a few lines of code (see below). Line charts can also be initialized via a <b>nib</b> or with a <b>frame</b>.
 
 	JBLineChartView *lineChartView = [[JBLineChartView alloc] init];
-    lineChartView.dataSource = self;
-    lineChartView.delegate = self;
-    [self addSubview:lineChartView];
+	lineChartView.dataSource = self;
+	lineChartView.delegate = self;
+	[self addSubview:lineChartView];
+
+Just like you would for a `UITableView`, ensure you clear these properties in your `dealloc`:
+
+	- (void)dealloc
+	{
+		JBLineChartView *lineChartView = ...; // i.e. _lineChartView
+		lineChartView.delegate = nil;
+		lineChartView.dataSource = nil;
+	}
 
 At a minimum, you need to inform the data source how many lines and vertical data points (for each line) are in the chart: