Merge pull request #99 from jwilling/override-init-layout

Fix layout initializers
jwilling · Jan 26, 2014 · ff014de · ff014de
2 parents 67ad7af + 61bcb58
commit ff014de
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/JNWCollectionView/JNWCollectionViewGridLayout.m b/JNWCollectionView/JNWCollectionViewGridLayout.m
@@ -68,8 +68,8 @@ @interface JNWCollectionViewGridLayout()
 
 @implementation JNWCollectionViewGridLayout
 
-- (instancetype)initWithCollectionView:(JNWCollectionView *)collectionView {
-	self = [super initWithCollectionView:collectionView];
+- (instancetype)init {
+	self = [super init];
 	if (self == nil) return nil;
 	self.itemSize = JNWCollectionViewGridLayoutDefaultSize;
 	return self;

diff --git a/JNWCollectionView/JNWCollectionViewListLayout.m b/JNWCollectionView/JNWCollectionViewListLayout.m
@@ -67,8 +67,8 @@ @interface JNWCollectionViewListLayout()
 
 @implementation JNWCollectionViewListLayout
 
-- (instancetype)initWithCollectionView:(JNWCollectionView *)collectionView {
-	self = [super initWithCollectionView:collectionView];
+- (instancetype)init {
+	self = [super init];
 	if (self == nil) return nil;
 	self.rowHeight = 44.f;
 	return self;

diff --git a/JNWCollectionViewTests/JNWCollectionViewSpec.m b/JNWCollectionViewTests/JNWCollectionViewSpec.m
@@ -41,7 +41,7 @@
 
 	beforeAll(^{
 		collectionView = [[JNWCollectionView alloc] initWithFrame:CGRectMake(0, 0, 400, 400)];
-		collectionViewLayout = [[JNWCollectionViewLayout alloc] initWithCollectionView:collectionView];
+		collectionViewLayout = [[JNWCollectionViewLayout alloc] init];
 		collectionView.collectionViewLayout = collectionViewLayout;
 		testDataSource = [[JNWTestDataSource alloc] init];
 		collectionView.dataSource = testDataSource;
@@ -82,7 +82,7 @@
 
 	beforeAll(^{
 		collectionView = [[JNWCollectionView alloc] initWithFrame:CGRectMake(0, 0, 300, 500)];
-		collectionViewLayout = [[JNWCollectionViewLayout alloc] initWithCollectionView:collectionView];
+		collectionViewLayout = [[JNWCollectionViewLayout alloc] init];
 		collectionView.collectionViewLayout = collectionViewLayout;
 		dataSource = [[JNWTestDataSource alloc] init];
 		collectionView.dataSource = dataSource;

diff --git a/JNWCollectionViewTests/JNWTestImplementation.m b/JNWCollectionViewTests/JNWTestImplementation.m
@@ -42,7 +42,7 @@ - (NSInteger)numberOfSectionsInCollectionView:(JNWCollectionView *)collectionVie
 }
 
 - (JNWCollectionViewReusableView *)collectionView:(JNWCollectionView *)collectionView viewForSupplementaryViewOfKind:(NSString *)kind inSection:(NSInteger)section {
-	if ([kind isEqualToString:JNWCollectionViewListLayoutHeaderIdentifier]) {
+	if ([kind isEqualToString:JNWCollectionViewListLayoutHeaderKind]) {
 		JNWCollectionViewReusableView *header = [collectionView dequeueReusableSupplementaryViewOfKind:kind withReuseIdentifer:kTestDataSourceHeaderIdentifier];
 		return header;
 	} else {