Merge pull request #7433 from hansemannn/TIMOB-17247

[TIMOB-17247] iOS: Add contentSize to scrollView event
tidev · Nov 12, 2015 · 7e00edf · 7e00edf
2 parents 8f0749b + fd17262
commit 7e00edf
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/apidoc/Titanium/UI/ScrollView.yml b/apidoc/Titanium/UI/ScrollView.yml
@@ -98,6 +98,13 @@ events:
   - name: scroll
     summary: Fired when the scrollable region is scrolled.
     properties:
+
+      - name: contentSize
+        summary: |
+            The current content size of the scroll view defined by its `width` and `height` properties.
+        type: Dictionary
+        platforms: [iphone, ipad]
+
       - name: decelerating
         summary: Indicates whether the scroll is decelerating.
         type: Boolean

diff --git a/iphone/Classes/TiUIScrollViewProxy.m b/iphone/Classes/TiUIScrollViewProxy.m
@@ -391,6 +391,7 @@ -(void)scrollViewDidScroll:(UIScrollView *)scrollView
                 NUMBOOL([scrollView isZooming]),@"zooming",
                 NUMBOOL([scrollView isDecelerating]),@"decelerating",
                 NUMBOOL([scrollView isDragging]),@"dragging",
+                [TiUtils sizeToDictionary:scrollView.contentSize], @"contentSize",
                 nil]];
     }
 }