diff --git a/iphone/Classes/TiUIScrollViewProxy.m b/iphone/Classes/TiUIScrollViewProxy.m index 33f75a7fa79..aebe52dcef2 100644 --- a/iphone/Classes/TiUIScrollViewProxy.m +++ b/iphone/Classes/TiUIScrollViewProxy.m @@ -430,11 +430,17 @@ - (void)scrollViewDidEndZooming:(UIScrollView *)scrollView withView:(UIView *)vi - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView { + CGPoint offset = [scrollView contentOffset]; + NSDictionary *drag_dict = [NSDictionary dictionaryWithObjectsAndKeys: + NUMFLOAT(offset.x), @"x", + NUMFLOAT(offset.y), @"y", + NUMBOOL([scrollView isDecelerating]), @"decelerating", + [TiUtils sizeToDictionary:scrollView.contentSize], @"contentSize", nil]; if ([self _hasListeners:@"dragStart"]) { // TODO: Deprecate old event - [self fireEvent:@"dragStart" withObject:nil]; + [self fireEvent:@"dragStart" withObject:drag_dict]; } if ([self _hasListeners:@"dragstart"]) { - [self fireEvent:@"dragstart" withObject:nil]; + [self fireEvent:@"dragstart" withObject:drag_dict]; } } @@ -442,11 +448,18 @@ - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL)decelerate { + CGPoint offset = [scrollView contentOffset]; + NSDictionary *drag_dict = [NSDictionary dictionaryWithObjectsAndKeys: + NUMFLOAT(offset.x), @"x", + NUMFLOAT(offset.y), @"y", + [NSNumber numberWithBool:decelerate], @"decelerate", nil, + [TiUtils sizeToDictionary:scrollView.contentSize], @"contentSize", nil]; + if ([self _hasListeners:@"dragEnd"]) { // TODO: Deprecate old event - [self fireEvent:@"dragEnd" withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:decelerate], @"decelerate", nil]]; + [self fireEvent:@"dragEnd" withObject:drag_dict]; } if ([self _hasListeners:@"dragend"]) { - [self fireEvent:@"dragend" withObject:[NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithBool:decelerate], @"decelerate", nil]]; + [self fireEvent:@"dragend" withObject:drag_dict]; } }