Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of git://github.com/joehewitt/three20

  • Loading branch information...
commit d031df354d144ee0dea7688c3e402548a7622516 2 parents 242f369 + 35ed4fd
@sco authored
View
9 src/NSDateAdditions.m
@@ -5,9 +5,12 @@
@implementation NSDate (TTCategory)
+ (id)dateWithToday {
- NSString* format = @"%Y-%m-%d 00:00:00 +0700";
- NSString* time = [[NSDate date] descriptionWithCalendarFormat:format timeZone:nil locale:nil];
- return [self dateWithString:time];
+ NSString* format = @"%Y-%m-%d";
+ NSDateFormatter* formatter = [[[NSDateFormatter alloc] initWithDateFormat:format
+ allowNaturalLanguage:NO] autorelease];
+
+ NSString* time = [formatter stringFromDate:[NSDate date]];
+ return [formatter dateFromString:time];
}
@end
View
2  src/TTSearchTextField.m
@@ -420,6 +420,8 @@ - (void)showSearchResults:(BOOL)show {
[superview addSubview:_shadowView];
}
}
+
+ [_tableView deselectRowAtIndexPath:_tableView.indexPathForSelectedRow animated:NO];
} else {
UIView* parent = self.superview;
if (parent) {
View
2  src/TTStyledFrame.m
@@ -158,7 +158,7 @@ - (void)drawInRect:(CGRect)rect {
}
- (TTStyledBoxFrame*)hitTest:(CGPoint)point {
- if (CGRectContainsPoint(CGRectInset(_bounds, 0, -5), point)) {
+ if (CGRectContainsPoint(_bounds, point)) {
TTStyledBoxFrame* frame = [_firstChildFrame hitTest:point];
return frame ? frame : self;
} else if (_nextFrame) {
View
1  src/TTThumbsTableViewCell.m
@@ -151,7 +151,6 @@ - (void)setPhoto:(id<TTPhoto>)photo {
_thumbView1.thumbURL = [_photo urlForVersion:TTPhotoVersionThumbnail];
[self assignPhotoAtIndex:_photo.index+1 toView:_thumbView2];
- [self assignPhotoAtIndex:_photo.index+1 toView:_thumbView2];
[self assignPhotoAtIndex:_photo.index+2 toView:_thumbView3];
[self assignPhotoAtIndex:_photo.index+3 toView:_thumbView4];
}
View
6 src/TTThumbsViewController.m
@@ -29,13 +29,15 @@ - (BOOL)hasMoreToLoad {
- (id)initWithController:(TTThumbsViewController*)controller {
if (self = [super init]) {
_controller = controller;
- [_controller.photoSource.delegates addObject:self];
+ _photoSource = [_controller.photoSource retain];
+ [_photoSource.delegates addObject:self];
}
return self;
}
- (void)dealloc {
- [_controller.photoSource.delegates removeObject:self];
+ [_photoSource.delegates removeObject:self];
+ [_photoSource release];
[super dealloc];
}
View
1  src/Three20/TTThumbsViewController.h
@@ -22,6 +22,7 @@
@interface TTThumbsDataSource : TTDataSource
<TTPhotoSourceDelegate, TTThumbsTableViewCellDelegate> {
TTThumbsViewController* _controller;
+ id<TTPhotoSource> _photoSource;
}
- (id)initWithController:(TTThumbsViewController*)controller;
Please sign in to comment.
Something went wrong with that request. Please try again.