Skip to content
Browse files

Disable animated placeholder changes for now

  • Loading branch information...
1 parent 478f8ab commit 9cf8121be36744acf3f3dc1befa4401d13200c59 @soffes soffes committed
Showing with 8 additions and 5 deletions.
  1. +1 −1 SSManagedViewController.h
  2. +7 −4 SSManagedViewController.m
View
2 SSManagedViewController.h
@@ -17,7 +17,7 @@
@property (nonatomic, strong) SSManagedObject *managedObject;
@property (nonatomic, strong) NSFetchedResultsController *fetchedResultsController;
@property (nonatomic, assign) BOOL ignoreChange;
-@property (nonatomic, assign) BOOL loading;
+@property (nonatomic, assign, getter=isLoading) BOOL loading;
@property (nonatomic, strong) UIView *noContentView;
@property (nonatomic, strong) UIView *loadingView;
View
11 SSManagedViewController.m
@@ -137,8 +137,11 @@ - (BOOL)hasContent {
- (void)updatePlaceholderViews:(BOOL)animated {
+ // Disable animated changes for now since they are buggy
+ animated = NO;
+
// There is content to be displayed
- if (self.hasContent) {
+ if ([self hasContent]) {
// Hide the loading and content view
[self hideLoadingView:animated];
[self hideNoContentView:animated];
@@ -146,7 +149,7 @@ - (void)updatePlaceholderViews:(BOOL)animated {
}
// There is no content to be displayed.
- if (self.loading) {
+ if ([self isLoading]) {
// Show the loading view and hide the no content view
[self hideNoContentView:animated];
[self showLoadingView:animated];
@@ -184,7 +187,7 @@ - (void)hideLoadingView:(BOOL)animated {
if (!self.loadingView || !self.loadingView.superview) {
return;
}
-
+
void (^change)(void) = ^{
self.loadingView.alpha = 0.0f;
};
@@ -228,7 +231,7 @@ - (void)hideNoContentView:(BOOL)animated {
if (!self.noContentView || !self.noContentView.superview) {
return;
}
-
+
void (^change)(void) = ^{
self.noContentView.alpha = 0.0f;
};

0 comments on commit 9cf8121

Please sign in to comment.
Something went wrong with that request. Please try again.