Merge pull request #8145 from hansemannn/TIMOB-23659

[TIMOB-23659] iOS: Fix "swipeToClose" on root window
tidev · Jul 20, 2016 · 76915cb · 76915cb
2 parents 4b12664 + 99a6e9e
commit 76915cb
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/iphone/Classes/TiUIiOSNavWindowProxy.m b/iphone/Classes/TiUIiOSNavWindowProxy.m
@@ -98,10 +98,12 @@ -(UINavigationController*)controller
 
 -(BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)gestureRecognizer
 {
-    if (current != nil) {
+    BOOL isRootWindow = (current == rootWindow);
+
+    if (current != nil && !isRootWindow) {
         return [TiUtils boolValue:[current valueForKey:@"swipeToClose"] def:YES];
     }
-    return YES;
+    return !isRootWindow;
 }
 
 -(void)openWindow:(NSArray*)args