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/08/24 14:13:51 UTC
[2/2] incubator-weex git commit: Merge branch
'ios-feature-accessibility' of https://github.com/acton393/incubator-weex
into wip-us-0.16-dev
Merge branch 'ios-feature-accessibility' of https://github.com/acton393/incubator-weex into wip-us-0.16-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/b7fa6545
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b7fa6545
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b7fa6545
Branch: refs/heads/0.16-dev
Commit: b7fa65451917ae6baf182c7d61d65175391a294f
Parents: 364a40c b2a1d53
Author: acton393 <zh...@gmail.com>
Authored: Thu Aug 24 22:14:37 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Aug 24 22:14:37 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK/Sources/Component/WXAComponent.m | 5 ++++-
ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m | 4 +++-
ios/sdk/WeexSDK/Sources/Component/WXSwitchComponent.m | 5 ++++-
ios/sdk/WeexSDK/Sources/Component/WXTextAreaComponent.m | 5 ++++-
ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m | 6 ++++--
5 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7fa6545/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b7fa6545/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
----------------------------------------------------------------------
diff --cc ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index 17c2786,d52061d..98ec82c
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@@ -281,9 -279,12 +280,12 @@@ do {
useCoreText = [(WXTextComponent*)self.view.wx_component useCoreText];
}
if (!useCoreText) {
- ((WXText *)self.view).textStorage = _textStorage;
+ ((WXTextView *)self.view).textStorage = _textStorage;
}
- self.view.isAccessibilityElement = YES;
+
+ if (!_testId) {
+ self.view.isAccessibilityElement = YES;
+ }
[self setNeedsDisplay];
}