Merge pull request #1996 from wikimedia/bug/disable_w_icon_popover

Disable w icon popover
wikimedia · Dec 15, 2017 · 9cad536 · 9cad536
2 parents e1e9e9d + 62c4334
commit 9cad536
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/Wikipedia/Code/WMFArticleViewController.m b/Wikipedia/Code/WMFArticleViewController.m
@@ -1869,11 +1869,12 @@ - (NSString *)analyticsName {
 #pragma mark - One-time toolbar item popover tips
 
 - (BOOL)shouldShowWIconPopover {
-    if (!self.navigationController || [[NSUserDefaults standardUserDefaults] wmf_didShowWIconPopover]) {
-        return NO;
-    } else {
-        return YES;
-    }
+    return NO;
+    //    if (!self.navigationController || [[NSUserDefaults standardUserDefaults] wmf_didShowWIconPopover]) {
+    //        return NO;
+    //    } else {
+    //        return YES;
+    //    }
 }
 
 - (void)showWIconPopoverIfNecessary {
@@ -1886,9 +1887,6 @@ - (void)showWIconPopoverIfNecessary {
 
 - (void)cancelWIconPopoverDisplay {
     [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(showWIconPopover) object:nil];
-    if (self.presentedViewController) {
-        [self dismissViewControllerAnimated:NO completion:NULL];
-    }
 }
 
 - (void)showWIconPopover {