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/05/05 09:45:31 UTC
[1/3] incubator-weex git commit: * [ios] try to fix weak object store
crash
Repository: incubator-weex
Updated Branches:
refs/heads/0.13-dev 4794dd7b3 -> a044ec8b5
* [ios] try to fix weak object store crash
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/f03e671e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/f03e671e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/f03e671e
Branch: refs/heads/0.13-dev
Commit: f03e671e0e3a2b65050231da64081e76efa5dad5
Parents: 3b2ab91
Author: acton393 <zh...@gmail.com>
Authored: Fri May 5 16:27:53 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri May 5 16:27:53 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/f03e671e/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
index 4af469e..74cfe36 100644
--- a/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
+++ b/ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m
@@ -349,6 +349,10 @@ if ([removeEventName isEqualToString:@#eventName]) {\
- (void)onSwipe:(UISwipeGestureRecognizer *)gesture
{
+ if (![self isViewLoaded]) {
+ return;
+ }
+
UISwipeGestureRecognizerDirection direction = gesture.direction;
NSString *directionString;
@@ -396,6 +400,10 @@ if ([removeEventName isEqualToString:@#eventName]) {\
- (void)onLongPress:(UILongPressGestureRecognizer *)gesture
{
+ if (![self isViewLoaded]) {
+ return;
+ }
+
if (gesture.state == UIGestureRecognizerStateBegan) {
CGPoint screenLocation = [gesture locationInView:self.view.window];
CGPoint pageLoacation = [gesture locationInView:self.weexInstance.rootView];
@@ -450,6 +458,10 @@ if ([removeEventName isEqualToString:@#eventName]) {\
- (void)onPan:(UIPanGestureRecognizer *)gesture
{
+ if (![self isViewLoaded]) {
+ return;
+ }
+
CGPoint screenLocation = [gesture locationInView:self.view.window];
CGPoint pageLoacation = [gesture locationInView:self.weexInstance.rootView];
NSString *eventName;
[2/3] incubator-weex git commit: Merge branch '0.13-dev' of
https://github.com/acton393/incubator-weex into apache-0.13-dev
Posted by ac...@apache.org.
Merge branch '0.13-dev' of https://github.com/acton393/incubator-weex into apache-0.13-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/53695c73
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/53695c73
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/53695c73
Branch: refs/heads/0.13-dev
Commit: 53695c73670c65fe64faa56bcbc0521bd708e7f3
Parents: d184e1b f03e671
Author: acton393 <zh...@gmail.com>
Authored: Fri May 5 17:44:18 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri May 5 17:44:18 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Events/WXComponent+Events.m | 12 ++++++++++++
1 file changed, 12 insertions(+)
----------------------------------------------------------------------
[3/3] incubator-weex git commit: Merge branch '0.13-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.13-dev
Posted by ac...@apache.org.
Merge branch '0.13-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into apache-0.13-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/a044ec8b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a044ec8b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a044ec8b
Branch: refs/heads/0.13-dev
Commit: a044ec8b5e9beea6113d8507c39ea6b1c9a6f48e
Parents: 53695c7 4794dd7
Author: acton393 <zh...@gmail.com>
Authored: Fri May 5 17:44:37 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Fri May 5 17:44:37 2017 +0800
----------------------------------------------------------------------
doc/source/cn/references/bubble.md | 146 ++++++++++++++++++
doc/source/cn/references/downgrade.md | 11 ++
doc/source/cn/references/index.md | 4 +-
doc/source/cn/v-0.10/references/bubble.md | 150 +++++++++++++++++++
doc/source/references/bubble.md | 146 ++++++++++++++++++
doc/source/references/downgrade.md | 11 ++
doc/source/references/index.md | 2 +
doc/source/v-0.10/references/bubble.md | 150 +++++++++++++++++++
html5/runtime/vdom/document.js | 4 +-
html5/runtime/vdom/element.js | 25 +++-
html5/test/unit/default/vm/vm.js | 2 +-
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 4 +
ios/sdk/WeexSDK/Sources/Model/WXSDKInstance.m | 9 +-
.../Sources/Protocol/WXConfigCenterProtocol.h | 20 +++
package.json | 4 +-
15 files changed, 677 insertions(+), 11 deletions(-)
----------------------------------------------------------------------