Commit Graph

98 Commits

Author SHA1 Message Date
knoxHuang bd8127aff7 optimization shader and tooltip for #fireball/issues/4771 2016-12-19 18:19:18 +08:00
knoxHuang ca72d3c46a fix page view error for fireball/issues/4758 2016-12-07 10:59:49 +08:00
zilongshanren 96f5b87575 minor fix 2016-11-08 15:30:25 +08:00
zilongshanren f7e84d7ecb add viewgroup 2016-11-08 14:49:06 +08:00
zilongshanren e4aa8b2daa make code more compact 2016-11-04 17:58:33 +08:00
zilongshanren 26a4e8d4fe remove unused stopPropagation call 2016-11-04 17:54:20 +08:00
zilongshanren cff6ef31c2 improve PageView 2016-11-04 17:49:44 +08:00
zilongshanren 36d71807f6 improve scrollview code 2016-11-04 16:52:59 +08:00
zilongshanren 8269f6b070 fix scrollview event handling
fix capture phase handling

fix nested scrollview

remove unused code
2016-11-04 16:39:07 +08:00
zilongshanren 030806f9c0 fix getScrollOffset API direction 2016-11-03 14:35:02 +08:00
zilongshanren 21a40e37c1 add the missing API docs 2016-10-19 15:22:39 +08:00
zilongshanren fdf6b5f8c1 refactoring scrollview event type 2016-10-18 17:27:28 +08:00
zilongshanren b618c77d5b improve PageView 2016-10-18 16:04:42 +08:00
zilongshanren 92d58f403f improve PageView auto scroll ended event 2016-10-17 14:52:04 +08:00
zilongshanren 04389e27dd add setAutoScrollStopEpsilon API 2016-10-10 14:02:53 +08:00
knoxHuang 2e2f7133f7 fix page view slide error 2016-10-08 15:49:10 +08:00
knoxHuang 3ed9026a8a fix scrollToOffset error for fireball/issues/4271 2016-09-30 09:44:33 +08:00
knoxHuang 99765ac2f4 add pageview to componet for fireball/issues/1461 2016-09-12 10:37:15 +08:00
zilongshanren 232e6a53c5 fix Scrollview mouse wheel scroll direction 2016-09-06 11:45:32 +08:00
zilongshanren 11982eee33 don't execute adjust content logic in editor 2016-09-02 11:21:48 +08:00
Wang Nan f7b32517e9 Merge pull request #1075 from zilongshanren/add-scrollview-touchup-event-v1.2
add touch up event to scrollview
2016-09-02 09:34:23 +08:00
zilongshanren e43fe1d47f fix scrollview enable event handling 2016-08-31 16:27:13 +08:00
zilongshanren ca69aaf1fe add touch up event to scrollview 2016-08-31 16:12:30 +08:00
zilongshanren a871df4fc8 fix outOfBoundary when scrollview size changed 2016-08-19 11:54:11 +08:00
zilongshanren 2e319a3881 only register event when content is not null 2016-08-16 18:03:02 +08:00
zilongshanren 6874db8130 add doc 2016-08-16 13:49:59 +08:00
zilongshanren 7d2edd2613 fix scrollview outOfBoundary issue 2016-08-16 13:49:51 +08:00
Wang Nan 02c5a9babb Merge pull request #1030 from pandamicro/v1.2
Add cancelInnerEvents property in ScrollView
2016-08-15 09:42:20 +08:00
pandamicro 54149c7c33 Fix API docs 2016-08-15 01:15:43 +08:00
pandamicro ecf8f8ce65 Add cancelInnerEvents property in ScrollView 2016-08-12 12:46:45 +08:00
Wang Nan b474a9dd57 Merge pull request #1029 from pandamicro/v1.2
Fix some issues introduced in v1.2
2016-08-12 11:51:32 +08:00
pandamicro aa4d23076c Only send one touch cancel event when ScrollView scrolled 2016-08-11 15:44:40 +08:00
zilongshanren dd85de6cbb fix scrollbar opacity issue 2016-08-05 10:59:51 +08:00
zilongshanren dff3f74ddb make scrollview brake more aggressive 2016-07-29 14:19:34 +08:00
pandamicro fba23137e0 ScrollView send touch cancel when block inner content's touch event 2016-07-28 17:19:44 +08:00
zilongshanren ad26127da7 fix scrollview content jump in editor
ticket: https://github.com/cocos-creator/fireball/issues/3737
2016-07-26 16:48:55 +08:00
Nan Wang 1f7adb2c5c merge v1.1 fixes 2016-07-19 10:04:06 +08:00
zilongshanren 5f350544ac refactoring layout and label update timing 2016-07-18 16:57:40 +08:00
Jare Guo d683b89dc1 Merge pull request #912 from zilongshanren/fix-scrollview-layout
only do layout when layout is active in scrollview
2016-07-15 14:20:21 +08:00
zilongshanren 45443cf365 only do layout when layout is active in scrollview 2016-07-15 09:39:27 +08:00
zilongshanren ea0dbacde5 add stopAutoScroll API for scrollview
Fixed: https://github.com/cocos-creator/fireball/issues/1829
2016-07-14 15:27:02 +08:00
zilongshanren 67e7835a74 hidden scrollbar when content size smaller than scrollview 2016-07-11 09:28:15 +08:00
zilongshanren f3f121b6e2 stop scroll when scrollview is disabled 2016-07-06 18:51:46 +08:00
zilongshanren 7d2a9985e4 reuse _onTouchCancel logic 2016-06-24 14:59:17 +08:00
zilongshanren a6ebe3ce5f fix button state error when scroll in scrollview 2016-06-24 14:36:21 +08:00
zilongshanren 303cd014c3 remove unused logic 2016-06-08 17:32:56 +08:00
Nan Wang e05160ac22 fixed node not clickable in scrollview 2016-06-08 16:09:40 +08:00
Wang Nan a9983c470f Merge pull request #779 from pandamicro/master
add capture phase and refactor button and scrollview
2016-06-08 15:45:39 +08:00
zilongshanren de1b8d0a5e fix scrollview scrollToOffset 2016-06-06 14:34:23 +08:00
pandamicro 272ac66762 Remove preventDefault in event 2016-06-02 15:33:01 +08:00