Skip to content

Commit

Permalink
Merge pull request #340 from corristo/storyboard-factory
Browse files Browse the repository at this point in the history
Make TyphoonStoryboard accept id<TyphoonComponentFactory> instead of TyphoonComponentFactory
  • Loading branch information
jasperblues committed Apr 20, 2015
2 parents bb95f84 + 8f02924 commit 2c1baa3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Source/ios/Storyboard/TyphoonStoryboard.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
*/
@interface TyphoonStoryboard : UIStoryboard

@property(nonatomic, strong) TyphoonComponentFactory *factory;
@property(nonatomic, strong) id<TyphoonComponentFactory> factory;

+ (TyphoonStoryboard *)storyboardWithName:(NSString *)name bundle:(NSBundle *)storyboardBundleOrNil;

+ (TyphoonStoryboard *)storyboardWithName:(NSString *)name factory:(TyphoonComponentFactory *)factory bundle:(NSBundle *)bundleOrNil;
+ (TyphoonStoryboard *)storyboardWithName:(NSString *)name factory:(id<TyphoonComponentFactory>)factory bundle:(NSBundle *)bundleOrNil;

@end

Expand Down
2 changes: 1 addition & 1 deletion Source/ios/Storyboard/TyphoonStoryboard.m
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ + (TyphoonStoryboard *)storyboardWithName:(NSString *)name bundle:(NSBundle *)st
return [self storyboardWithName:name factory:nil bundle:storyboardBundleOrNil];
}

+ (TyphoonStoryboard *)storyboardWithName:(NSString *)name factory:(TyphoonComponentFactory *)factory bundle:(NSBundle *)bundleOrNil
+ (TyphoonStoryboard *)storyboardWithName:(NSString *)name factory:(id<TyphoonComponentFactory>)factory bundle:(NSBundle *)bundleOrNil
{
TyphoonStoryboard *storyboard = (id) [super storyboardWithName:name bundle:bundleOrNil];
storyboard.factory = factory;
Expand Down

0 comments on commit 2c1baa3

Please sign in to comment.