remove auto-hidden

remove auto-hidden

MJRefresh.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = 'MJRefresh'
-    s.version      = '3.1.15.6'
+    s.version      = '3.1.16'
     s.summary      = 'An easy way to use pull-to-refresh'
     s.homepage     = 'https://github.com/CoderMJLee/MJRefresh'
     s.license      = 'MIT'

MJRefresh/Base/MJRefreshFooter.h

@@ -26,5 +26,5 @@
 @property (assign, nonatomic) CGFloat ignoredScrollViewContentInsetBottom;
 
 /** 自动根据有无数据来显示和隐藏（有数据就显示，没有数据隐藏。默认是NO） */
-@property (assign, nonatomic, getter=isAutomaticallyHidden) BOOL automaticallyHidden MJRefreshDeprecated("不建议使用此属性，开发者请自行控制footer的显示和隐藏。基于安全考虑，在未来的某些版本此属性可能作废");
+@property (assign, nonatomic, getter=isAutomaticallyHidden) BOOL automaticallyHidden MJRefreshDeprecated("已废弃此属性，开发者请自行控制footer的显示和隐藏");
 @end

MJRefresh/Base/MJRefreshFooter.m

@@ -38,24 +38,24 @@ - (void)prepare
     self.mj_h = MJRefreshFooterHeight;
     
     // 默认不会自动隐藏
-    self.automaticallyHidden = NO;
+//    self.automaticallyHidden = NO;
 }
 
-- (void)willMoveToSuperview:(UIView *)newSuperview
-{
-    [super willMoveToSuperview:newSuperview];
-    
-    if (newSuperview) {
-        // 监听scrollView数据的变化
-        if ([self.scrollView isKindOfClass:[UITableView class]] || [self.scrollView isKindOfClass:[UICollectionView class]]) {
-            [self.scrollView setMj_reloadDataBlock:^(NSInteger totalDataCount) {
-                if (self.isAutomaticallyHidden) {
-                    self.hidden = (totalDataCount == 0);
-                }
-            }];
-        }
-    }
-}
+//- (void)willMoveToSuperview:(UIView *)newSuperview
+//{
+//    [super willMoveToSuperview:newSuperview];
+//
+//    if (newSuperview) {
+//        // 监听scrollView数据的变化
+//        if ([self.scrollView isKindOfClass:[UITableView class]] || [self.scrollView isKindOfClass:[UICollectionView class]]) {
+//            [self.scrollView setMj_reloadDataBlock:^(NSInteger totalDataCount) {
+//                if (self.isAutomaticallyHidden) {
+//                    self.hidden = (totalDataCount == 0);
+//                }
+//            }];
+//        }
+//    }
+//}
 
 #pragma mark - 公共方法
 - (void)endRefreshingWithNoMoreData

MJRefresh/UIScrollView+MJRefresh.h

@@ -22,5 +22,5 @@
 
 #pragma mark - other
 - (NSInteger)mj_totalDataCount;
-@property (copy, nonatomic) void (^mj_reloadDataBlock)(NSInteger totalDataCount);
+//@property (copy, nonatomic) void (^mj_reloadDataBlock)(NSInteger totalDataCount);
 @end

MJRefresh/UIScrollView+MJRefresh.m

@@ -88,72 +88,71 @@ - (MJRefreshHeader *)header
 {
     return self.mj_header;
 }
-
 #pragma mark - other
 - (NSInteger)mj_totalDataCount
 {
     NSInteger totalCount = 0;
     if ([self isKindOfClass:[UITableView class]]) {
         UITableView *tableView = (UITableView *)self;
-        
-        for (NSInteger section = 0; section<tableView.numberOfSections; section++) {
+
+        for (NSInteger section = 0; section < tableView.numberOfSections; section++) {
             totalCount += [tableView numberOfRowsInSection:section];
         }
     } else if ([self isKindOfClass:[UICollectionView class]]) {
         UICollectionView *collectionView = (UICollectionView *)self;
-        
-        for (NSInteger section = 0; section<collectionView.numberOfSections; section++) {
+
+        for (NSInteger section = 0; section < collectionView.numberOfSections; section++) {
             totalCount += [collectionView numberOfItemsInSection:section];
         }
     }
     return totalCount;
 }
-
-static const char MJRefreshReloadDataBlockKey = '\0';
-- (void)setMj_reloadDataBlock:(void (^)(NSInteger))mj_reloadDataBlock
-{
-    [self willChangeValueForKey:@"mj_reloadDataBlock"]; // KVO
-    objc_setAssociatedObject(self, &MJRefreshReloadDataBlockKey, mj_reloadDataBlock, OBJC_ASSOCIATION_COPY_NONATOMIC);
-    [self didChangeValueForKey:@"mj_reloadDataBlock"]; // KVO
-}
-
-- (void (^)(NSInteger))mj_reloadDataBlock
-{
-    return objc_getAssociatedObject(self, &MJRefreshReloadDataBlockKey);
-}
-
-- (void)executeReloadDataBlock
-{
-    !self.mj_reloadDataBlock ? : self.mj_reloadDataBlock(self.mj_totalDataCount);
-}
 @end
+//static const char MJRefreshReloadDataBlockKey = '\0';
+//- (void)setMj_reloadDataBlock:(void (^)(NSInteger))mj_reloadDataBlock
+//{
+//    [self willChangeValueForKey:@"mj_reloadDataBlock"]; // KVO
+//    objc_setAssociatedObject(self, &MJRefreshReloadDataBlockKey, mj_reloadDataBlock, OBJC_ASSOCIATION_COPY_NONATOMIC);
+//    [self didChangeValueForKey:@"mj_reloadDataBlock"]; // KVO
+//}
+//
+//- (void (^)(NSInteger))mj_reloadDataBlock
+//{
+//    return objc_getAssociatedObject(self, &MJRefreshReloadDataBlockKey);
+//}
+
+//- (void)executeReloadDataBlock
+//{
+//    !self.mj_reloadDataBlock ? : self.mj_reloadDataBlock(self.mj_totalDataCount);
+//}
+//@end
+//
+//@implementation UITableView (MJRefresh)
+//
+//+ (void)load
+//{
+//    [self exchangeInstanceMethod1:@selector(reloadData) method2:@selector(mj_reloadData)];
+//}
+//
+//- (void)mj_reloadData
+//{
+//    [self mj_reloadData];
+//
+//    [self executeReloadDataBlock];
+//}
+//@end
 
-@implementation UITableView (MJRefresh)
-
-+ (void)load
-{
-    [self exchangeInstanceMethod1:@selector(reloadData) method2:@selector(mj_reloadData)];
-}
-
-- (void)mj_reloadData
-{
-    [self mj_reloadData];
-    
-    [self executeReloadDataBlock];
-}
-@end
-
-@implementation UICollectionView (MJRefresh)
-
-+ (void)load
-{
-    [self exchangeInstanceMethod1:@selector(reloadData) method2:@selector(mj_reloadData)];
-}
-
-- (void)mj_reloadData
-{
-    [self mj_reloadData];
-    
-    [self executeReloadDataBlock];
-}
-@end
+//@implementation UICollectionView (MJRefresh)
+//
+//+ (void)load
+//{
+//    [self exchangeInstanceMethod1:@selector(reloadData) method2:@selector(mj_reloadData)];
+//}
+//
+//- (void)mj_reloadData
+//{
+//    [self mj_reloadData];
+//
+//    [self executeReloadDataBlock];
+//}
+//@end