more fixes for cocoapods framework support. close jessesquires#773

alvincrisuy · Feb 7, 2015 · 0157f1a · 0157f1a
1 parent fc340cd
commit 0157f1a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/JSQMessagesViewController/Controllers/JSQMessagesViewController.m b/JSQMessagesViewController/Controllers/JSQMessagesViewController.m
@@ -105,13 +105,13 @@ @implementation JSQMessagesViewController
 + (UINib *)nib
 {
     return [UINib nibWithNibName:NSStringFromClass([JSQMessagesViewController class])
-                          bundle:[NSBundle bundleForClass:[self class]]];
+                          bundle:[NSBundle bundleForClass:[JSQMessagesViewController class]]];
 }
 
 + (instancetype)messagesViewController
 {
     return [[[self class] alloc] initWithNibName:NSStringFromClass([JSQMessagesViewController class])
-                                          bundle:[NSBundle bundleForClass:[self class]]];
+                                          bundle:[NSBundle bundleForClass:[JSQMessagesViewController class]]];
 }
 
 #pragma mark - Initialization

diff --git a/JSQMessagesViewController/Views/JSQMessagesCollectionViewCell.m b/JSQMessagesViewController/Views/JSQMessagesCollectionViewCell.m
@@ -73,17 +73,18 @@ @implementation JSQMessagesCollectionViewCell
 
 + (UINib *)nib
 {
-    return [UINib nibWithNibName:NSStringFromClass([self class]) bundle:[NSBundle bundleForClass:[self class]]];
+    return [UINib nibWithNibName:NSStringFromClass([JSQMessagesCollectionViewCell class])
+                          bundle:[NSBundle bundleForClass:[JSQMessagesCollectionViewCell class]]];
 }
 
 + (NSString *)cellReuseIdentifier
 {
-    return NSStringFromClass([self class]);
+    return NSStringFromClass([JSQMessagesCollectionViewCell class]);
 }
 
 + (NSString *)mediaCellReuseIdentifier
 {
-    return [NSString stringWithFormat:@"%@_JSQMedia", NSStringFromClass([self class])];
+    return [NSString stringWithFormat:@"%@_JSQMedia", NSStringFromClass([JSQMessagesCollectionViewCell class])];
 }
 
 #pragma mark - Initialization

diff --git a/JSQMessagesViewController/Views/JSQMessagesInputToolbar.m b/JSQMessagesViewController/Views/JSQMessagesInputToolbar.m
@@ -74,9 +74,9 @@ - (void)awakeFromNib
 
 - (JSQMessagesToolbarContentView *)loadToolbarContentView
 {
-    NSArray *nibViews = [[NSBundle bundleForClass:[self class]] loadNibNamed:NSStringFromClass([JSQMessagesToolbarContentView class])
-                                                                       owner:nil
-                                                                     options:nil];
+    NSArray *nibViews = [[NSBundle bundleForClass:[JSQMessagesInputToolbar class]] loadNibNamed:NSStringFromClass([JSQMessagesToolbarContentView class])
+                                                                                          owner:nil
+                                                                                        options:nil];
     return nibViews.firstObject;
 }