Merge pull request #4869 from vishalduggal/timob-10800

[TIMOB-10800] iOS: Let the tableview scroll freely
tidev · Oct 29, 2013 · 9fb198c · 9fb198c
2 parents ba370ac + b39e578
commit 9fb198c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/iphone/Classes/TiUITableView.m b/iphone/Classes/TiUITableView.m
@@ -2545,10 +2545,11 @@ - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL
 		[self.proxy fireEvent:@"dragend" withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:decelerate],@"decelerate",nil]]	;
 	}
 
+    //This section of code now moved to [TiUITextWidgetView updateKeyboardStatus]
     // Update keyboard status to insure that any fields actively being edited remain in view
-    if ([[[TiApp app] controller] keyboardVisible]) {
-        [[[TiApp app] controller] performSelector:@selector(handleNewKeyboardStatus) withObject:nil afterDelay:0.0];
-    }
+    //if ([[[TiApp app] controller] keyboardVisible]) {
+    //    [[[TiApp app] controller] performSelector:@selector(handleNewKeyboardStatus) withObject:nil afterDelay:0.0];
+    //}
 }
 
 

diff --git a/iphone/Classes/TiUITextWidget.h b/iphone/Classes/TiUITextWidget.h
@@ -36,7 +36,8 @@
 -(void)textWidget:(UIView<UITextInputTraits>*)tw didBlurWithText:(NSString *)value;
 -(void)setValue_:(id)text;
 -(void)setSelectionFrom:(id)start to:(id)end;
-
+#pragma mark - Titanium Internal Use Only
+-(void)updateKeyboardStatus;
 @end
 
 #endif
diff --git a/iphone/Classes/TiUITextWidget.m b/iphone/Classes/TiUITextWidget.m
@@ -240,6 +240,15 @@ -(void)setSelectionFrom:(id)start to:(id)end
         DebugLog(@"TextWidget does not conform with UITextInput protocol. Ignore");
     }
 }
+
+#pragma mark - Titanium Internal Use Only
+-(void)updateKeyboardStatus
+{
+    if ( ([[[TiApp app] controller] keyboardVisible]) && ([[[TiApp app] controller] keyboardFocusedProxy] == [self proxy]) ) {
+        [[[TiApp app] controller] performSelector:@selector(handleNewKeyboardStatus) withObject:nil afterDelay:0.0];
+    }
+}
+
 @end
 
 #endif
diff --git a/iphone/Classes/TiUITextWidgetProxy.m b/iphone/Classes/TiUITextWidgetProxy.m
@@ -103,6 +103,10 @@ -(void)noteValueChange:(NSString *)newValue
 		[self contentsWillChange];
 		[self fireEvent:@"change" withObject:[NSDictionary dictionaryWithObject:newValue forKey:@"value"]];
 	}
+    TiThreadPerformOnMainThread(^{
+        //Make sure the text widget is in view when editing.
+        [(TiUITextWidget*)[self view] updateKeyboardStatus];
+    }, NO);
 }
 
 #pragma mark Toolbar