Compare commits

..

3 Commits

Author SHA1 Message Date
Terry Worona 3cc39124b8 updated version 2014-05-04 09:48:10 -07:00
terryworona bedd7e2c71 Merge pull request #49 from simonnickel/master
fixed typo, renamed mininum -> minimum
2014-05-04 09:44:03 -07:00
Simon Nickel 786af91666 fixed typo, renamed mininum -> minimum 2014-05-03 22:18:42 +02:00
7 changed files with 22 additions and 18 deletions
+4
View File
@@ -1,5 +1,9 @@
# Changelog
## <a href="https://github.com/Jawbone/JBChartView/tree/v2.4.3">2.4.3</a>
#### 05/04/14
- Fixes issue <a href="https://github.com/Jawbone/JBChartView/pull/49">#49</a>.
## <a href="https://github.com/Jawbone/JBChartView/tree/v2.4.2">2.4.2</a>
#### 04/30/14
- Fixes issue <a href="https://github.com/Jawbone/JBChartView/pull/46">#46</a>.
+5 -5
View File
@@ -266,9 +266,9 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
- (CGFloat)minHeight
{
if (self.mininumValue != kJBChartViewUndefinedMinimumValue)
if (self.minimumValue != kJBChartViewUndefinedMinimumValue)
{
return MIN(self.mininumValue, self.cachedMinHeight);
return MIN(self.minimumValue, self.cachedMinHeight);
}
return self.cachedMinHeight;
}
@@ -398,13 +398,13 @@ static UIColor *kJBBarChartViewDefaultBarColor = nil;
return _cachedMaxHeight;
}
- (CGFloat)mininumValue
- (CGFloat)minimumValue
{
if ([super mininumValue] == kJBChartViewUndefinedMinimumValue)
if ([super minimumValue] == kJBChartViewUndefinedMinimumValue)
{
return self.cachedMinHeight;
}
return [super mininumValue];
return [super minimumValue];
}
- (CGFloat)maximumValue
+1 -1
View File
@@ -51,7 +51,7 @@ typedef NS_ENUM(NSInteger, JBChartViewState){
*
* For min/max modifications to take effect, reloadData must be called.
*/
@property (nonatomic, assign) CGFloat mininumValue;
@property (nonatomic, assign) CGFloat minimumValue;
@property (nonatomic, assign) CGFloat maximumValue;
/**
+4 -4
View File
@@ -59,7 +59,7 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
- (void)constructChartView
{
self.clipsToBounds = YES;
_mininumValue = kJBChartViewUndefinedMinimumValue;
_minimumValue = kJBChartViewUndefinedMinimumValue;
_maximumValue = kJBChartViewUndefinedMaximumValue;
}
@@ -138,10 +138,10 @@ static UIColor *kJBChartVerticalSelectionViewDefaultBgColor = nil;
[self setState:state animated:NO];
}
- (void)setMininumValue:(CGFloat)mininumValue
- (void)setMinimumValue:(CGFloat)minimumValue
{
NSAssert(mininumValue >= 0, @"JBChartView // the minimumValue must be >= 0.");
_mininumValue = mininumValue;
NSAssert(minimumValue >= 0, @"JBChartView // the minimumValue must be >= 0.");
_minimumValue = minimumValue;
}
- (void)setMaximumValue:(CGFloat)maximumValue
+5 -5
View File
@@ -402,9 +402,9 @@ static UIColor *kJBLineChartViewDefaultDotSelectionColor = nil;
- (CGFloat)minHeight
{
if (self.mininumValue != kJBChartViewUndefinedMinimumValue)
if (self.minimumValue != kJBChartViewUndefinedMinimumValue)
{
return MIN(self.mininumValue, self.cachedMinHeight);
return MIN(self.minimumValue, self.cachedMinHeight);
}
return self.cachedMinHeight;
}
@@ -724,13 +724,13 @@ static UIColor *kJBLineChartViewDefaultDotSelectionColor = nil;
return _cachedMaxHeight;
}
- (CGFloat)mininumValue
- (CGFloat)minimumValue
{
if ([super mininumValue] == kJBChartViewUndefinedMinimumValue)
if ([super minimumValue] == kJBChartViewUndefinedMinimumValue)
{
return self.cachedMinHeight;
}
return [super mininumValue];
return [super minimumValue];
}
- (CGFloat)maximumValue
+2 -2
View File
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "JBChartView"
s.version = "2.4.2"
s.version = "2.4.3"
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.4.2"
:tag => "v2.4.3"
}
s.platform = :ios, '7.0'
+1 -1
View File
@@ -38,7 +38,7 @@ Simply add the following line to your <code>Podfile</code>:
Your Podfile should look something like:
platform :ios, '7.0'
pod 'JBChartView', '~> 2.4.2'
pod 'JBChartView', '~> 2.4.3'
### The Old School Way