Merge commit 'joehewitt/master'

src/TTImageView.m

@@ -33,6 +33,10 @@ - (void)display {
   }
 }
 
+- (void)dealloc {
+  [super dealloc];
+}
+
 @end
 
 //////////////////////////////////////////////////////////////////////////////////////////////////

src/TTNavigationCenter.m

@@ -66,6 +66,10 @@ - (id)initWithClass:(Class)controllerClass rule:(TTNavigationRule)rule nib:(NSSt
 	return self;
 }
 
+- (void)dealloc {
+  [super dealloc];
+}
+
 @end
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////

src/TTSearchTextField.m

@@ -34,6 +34,10 @@ - (id)initWithTextField:(TTSearchTextField*)textField {
   return self;
 }
 
+- (void)dealloc {
+  [super dealloc];
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // UITextFieldDelegate
 

src/TTSearchlightLabel.m

@@ -140,6 +140,7 @@ - (void)stopAnimating {
     _timer = nil;
     [self releaseMask];
   }
+  [self setNeedsDisplay];	
 }
 
 @end

src/TTStyle.m

@@ -207,6 +207,15 @@ + (TTPartStyle*)styleWithName:(NSString*)name style:(TTStyle*)stylez next:(TTSty
   return style;
 }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+// NSObject
+
+- (void)dealloc {
+  [_name release];
+  [_style release];
+  [super dealloc];
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // TTStyle
 

src/TTStyledFrame.m

@@ -184,6 +184,10 @@ - (id)init {
   return self;
 }
 
+- (void)dealloc {
+  [super dealloc];
+}
+
 - (TTStyledInlineFrame*)inlineParentFrame {
   if ([_parentFrame isKindOfClass:[TTStyledInlineFrame class]]) {
     return (TTStyledInlineFrame*)_parentFrame;
@@ -244,6 +248,7 @@ - (id)initWithElement:(TTStyledElement*)element node:(TTStyledImageNode*)node {
 }
 
 - (void)dealloc {
+  [_style release];
   [super dealloc];
 }
 

src/TTStyledNode.m

@@ -478,6 +478,7 @@ - (id)init {
 - (void)dealloc {
   [_url release];
   [_image release];
+  [_defaultImage release];
   [super dealloc];
 }
 

src/TTTabBar.m

@@ -9,6 +9,7 @@
 
 static CGFloat kTabMargin = 10;
 static CGFloat kPadding = 10;
+static const NSInteger kMaxBadgeNumber = 99;
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -435,7 +436,11 @@ - (void)updateBadgeNumber {
       _badge.userInteractionEnabled = NO;
       [self addSubview:_badge];
     }
-    _badge.text = [NSString stringWithFormat:@"%d", _tabItem.badgeNumber];
+    if (_tabItem.badgeNumber <= kMaxBadgeNumber) {
+      _badge.text = [NSString stringWithFormat:@"%d", _tabItem.badgeNumber];
+    } else {
+      _badge.text = [NSString stringWithFormat:@"%d+", kMaxBadgeNumber];
+    }
     [_badge sizeToFit];
 
     _badge.frame = CGRectMake(self.width - _badge.width-1, 1, _badge.width, _badge.height);

src/TTTableField.m

@@ -168,12 +168,13 @@ - (void)dealloc {
 
 @implementation TTImageTableField
 
-@synthesize defaultImage = _defaultImage, image = _image;
+@synthesize defaultImage = _defaultImage, image = _image, imageStyle = _imageStyle;
 
 - (id)init {
   if (self = [super init]) {
     _defaultImage = nil;
     _image = nil;
+    _imageStyle = nil;
   }
   return self;
 }
@@ -194,6 +195,7 @@ - (id)initWithText:(NSString*)text url:(NSString*)url image:(NSString*)image {
 - (void)dealloc {
   [_image release];
   [_defaultImage release];
+  [_imageStyle release];
   [super dealloc];
 }
 

src/TTTableFieldCell.m

@@ -609,19 +609,32 @@ - (void)layoutSubviews {
     image = field.defaultImage;
   }
   if (_iconView.url) {
-    CGFloat iconWidth = image
-      ? image.size.width
-      : (field.image ? kDefaultIconSize : 0);
-    CGFloat iconHeight = image
-      ? image.size.height
-      : (field.image ? kDefaultIconSize : 0);
+      CGFloat iconWidth = image
+        ? image.size.width
+        : (field.image ? kDefaultIconSize : 0);
+      CGFloat iconHeight = image
+        ? image.size.height
+        : (field.image ? kDefaultIconSize : 0);
+
+    TTImageStyle* style = [field.imageStyle firstStyleOfClass:[TTImageStyle class]];
+    if (style) {
+      _iconView.contentMode = style.contentMode;
+      _iconView.clipsToBounds = YES;
+      _iconView.backgroundColor = [UIColor clearColor];
+      if (style.size.width) {
+        iconWidth = style.size.width;
+      }
+      if (style.size.height) {
+        iconWidth = style.size.height;
+      }
+    }
 
     _iconView.frame = CGRectMake(kHPadding, floor(self.height/2 - iconHeight/2),
-      iconWidth, iconHeight);
-
-    CGFloat innerWidth = self.contentView.width - (kHPadding*2 + iconWidth + kKeySpacing);
+                                 iconWidth, iconHeight);
+    
+    CGFloat innerWidth = self.contentView.width - (kHPadding*2 + _iconView.width + kKeySpacing);
     CGFloat innerHeight = self.contentView.height - kVPadding*2;
-    _label.frame = CGRectMake(kHPadding + iconWidth + kKeySpacing, kVPadding,
+    _label.frame = CGRectMake(kHPadding + _iconView.width + kKeySpacing, kVPadding,
       innerWidth, innerHeight);
   } else {
     _label.frame = CGRectInset(self.contentView.bounds, kHPadding, kVPadding);
@@ -639,6 +652,7 @@ - (void)setObject:(id)object {
     TTImageTableField* field = object;
     _iconView.defaultImage = field.defaultImage;
     _iconView.url = field.image;
+    _iconView.style = field.imageStyle;
   }  
 }
 @end

src/TTTableViewController.m

@@ -62,6 +62,10 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 
 - (void)dealloc {
   [_tableDelegate release];
+  [_dataSource release];
+  _dataSource = nil;
+  [_tableView release];
+  _tableView = nil;
   [super dealloc];
 }
 
@@ -279,6 +283,10 @@ - (void)setDataSource:(id<TTTableViewDataSource>)dataSource {
 - (void)didSelectObject:(id)object atIndexPath:(NSIndexPath*)indexPath {
 }
 
+- (BOOL)shouldNavigateToURL:(NSString*)url {
+  return YES;
+}
+
 - (void)didBeginDragging {
 }
 

src/TTTableViewDelegate.m

@@ -30,6 +30,10 @@ - (id)initWithController:(TTTableViewController*)controller {
   return self;
 }
 
+- (void)dealloc {
+  [super dealloc];
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // UITableViewDelegate
 
@@ -51,7 +55,7 @@ - (void)tableView:(UITableView*)tableView didSelectRowAtIndexPath:(NSIndexPath*)
   id object = [dataSource tableView:tableView objectForRowAtIndexPath:indexPath];
   if ([object isKindOfClass:[TTTableField class]]) {
     TTTableField* field = object;
-    if (field.url) {
+    if (field.url && [_controller shouldNavigateToURL:field.url]) {
       [[TTNavigationCenter defaultCenter] displayURL:field.url];
     }
 

src/TTTextEditor.m

@@ -33,6 +33,10 @@ - (id)initWithTextEditor:(TTTextEditor*)textEditor {
   return self;
 }
 
+- (void)dealloc {
+  [super dealloc];
+}
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 // UITextViewDelegate
 

src/TTURLRequestQueue.m

@@ -271,6 +271,7 @@ - (BOOL)cancel:(TTURLRequest*)request {
     if (_connection) {
       TTNetworkRequestStopped();
       [_connection cancel];
+      [_connection release];
       _connection = nil;
     }
     return NO;
@@ -433,6 +434,8 @@ - (void)executeLoader:(TTRequestLoader*)loader {
                expires:loader.cacheExpirationAge
                fromDisk:loader.cachePolicy & TTURLRequestCachePolicyDisk
                data:&data error:&error timestamp:&timestamp]) {
+    [_loaders removeObjectForKey:loader.cacheKey];
+
     if (!error) {
       error = [loader processResponse:nil data:data];
     }
@@ -441,8 +444,6 @@ - (void)executeLoader:(TTRequestLoader*)loader {
     } else {
       [loader dispatchLoaded:timestamp];
     }
-
-    [_loaders removeObjectForKey:loader.cacheKey];
   } else {
     ++_totalLoading;
     [loader load:[NSURL URLWithString:loader.url]];
@@ -474,14 +475,15 @@ - (void)loadNextInQueue {
   }
 }
 
-- (void)loadNextInQueueAfterLoader:(TTRequestLoader*)loader {
+- (void)removeLoader:(TTRequestLoader*)loader {
   --_totalLoading;
   [_loaders removeObjectForKey:loader.cacheKey];
-  [self loadNextInQueue];
 }
 
 - (void)loader:(TTRequestLoader*)loader didLoadResponse:(NSHTTPURLResponse*)response
     data:(id)data {
+  [self removeLoader:loader];
+
   NSError* error = [loader processResponse:response data:data];
   if (error) {
     [loader dispatchError:error];
@@ -492,17 +494,19 @@ - (void)loader:(TTRequestLoader*)loader didLoadResponse:(NSHTTPURLResponse*)resp
     [loader dispatchLoaded:[NSDate date]];
   }
 
-  [self loadNextInQueueAfterLoader:loader];
+  [self loadNextInQueue];
 }
 
 - (void)loader:(TTRequestLoader*)loader didFailLoadWithError:(NSError*)error {
+  [self removeLoader:loader];
   [loader dispatchError:error];
-  [self loadNextInQueueAfterLoader:loader];
+  [self loadNextInQueue];
 }
 
 - (void)loaderDidCancel:(TTRequestLoader*)loader wasLoading:(BOOL)wasLoading {
   if (wasLoading) {
-    [self loadNextInQueueAfterLoader:loader];
+    [self removeLoader:loader];
+    [self loadNextInQueue];
   } else {
     [_loaders removeObjectForKey:loader.cacheKey];
   }

src/Three20/TTTableField.h

@@ -1,6 +1,6 @@
 #import "Three20/TTGlobal.h"
 
-@class TTStyledText;
+@class TTStyledText, TTStyle;
 
 @interface TTTableField : NSObject {
   NSString* _text;
@@ -82,10 +82,12 @@
 @interface TTImageTableField : TTTableField {
   UIImage* _defaultImage;
   NSString* _image;
+  TTStyle* _imageStyle;
 }
 
 @property(nonatomic,retain) UIImage* defaultImage;
 @property(nonatomic,copy) NSString* image;
+@property(nonatomic,retain) TTStyle* imageStyle;
 
 - (id)initWithText:(NSString*)text url:(NSString*)url image:(NSString*)image;
 

src/Three20/TTTableViewController.h

@@ -20,6 +20,7 @@
 - (id<UITableViewDelegate>)createDelegate;
 
 - (void)didSelectObject:(id)object atIndexPath:(NSIndexPath*)indexPath;
+- (BOOL)shouldNavigateToURL:(NSString*)url;
 
 - (void)didBeginDragging;
 - (void)didEndDragging;

src/UIViewAdditions.m

@@ -26,6 +26,11 @@ @interface UIEventFake : NSObject {
 @end
 
 @implementation UIEventFake
+
+- (void)dealloc {
+  [super dealloc];
+}
+
 @end
 
 @interface UITouch (TTCategory)