You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/07/04 11:05:37 UTC
[1/3] incubator-weex git commit: Dismiss pickerview in dealloc if
needed
Repository: incubator-weex
Updated Branches:
refs/heads/0.15-dev 532d87ba1 -> e56f343a9
Dismiss pickerview in dealloc if needed
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5d1c57c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5d1c57c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5d1c57c0
Branch: refs/heads/0.15-dev
Commit: 5d1c57c047275aa16062a30d09a14ce5b7971cc3
Parents: 43adf40
Author: gaimanjing <ga...@gmail.com>
Authored: Mon Jun 26 16:33:05 2017 +0800
Committer: GitHub <no...@github.com>
Committed: Mon Jun 26 16:33:05 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5d1c57c0/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m b/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m
index 41ec9cc..fe1c4e2 100644
--- a/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m
+++ b/ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m
@@ -69,6 +69,13 @@ WX_EXPORT_METHOD(@selector(pickTime:callback:))
-(void)dealloc
{
[NSObject cancelPreviousPerformRequestsWithTarget:self];
+
+ if (nil != _backgroundView.superview) {
+ UIView* backgroundView = _backgroundView;
+ dispatch_async(dispatch_get_main_queue(), ^{
+ [backgroundView removeFromSuperview];
+ });
+ }
}
-(void)pick:(NSDictionary *)options callback:(WXModuleCallback)callback
[3/3] incubator-weex git commit: Merge remote-tracking branch
'wip-us/0.14-dev' into wip-us-0.15-dev
Posted by ac...@apache.org.
Merge remote-tracking branch 'wip-us/0.14-dev' into wip-us-0.15-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e56f343a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e56f343a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e56f343a
Branch: refs/heads/0.15-dev
Commit: e56f343a9fd4ca23957a32462a552bbe37b762c0
Parents: 532d87b 357f709
Author: acton393 <zh...@gmail.com>
Authored: Tue Jul 4 19:03:58 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Jul 4 19:03:58 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
[2/3] incubator-weex git commit: Merge branch '0.14-dev' of
https://github.com/gaimanjing/incubator-weex into wip-us-0.14-dev
Posted by ac...@apache.org.
Merge branch '0.14-dev' of https://github.com/gaimanjing/incubator-weex into wip-us-0.14-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/357f7097
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/357f7097
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/357f7097
Branch: refs/heads/0.15-dev
Commit: 357f70972e3d2f6ba5a39361abe3a45f91bee0cb
Parents: bc7ef1d 5d1c57c
Author: acton393 <zh...@gmail.com>
Authored: Tue Jul 4 18:58:40 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Tue Jul 4 18:58:40 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------