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 10:36:12 UTC
[24/24] 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/1584c881
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/1584c881
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/1584c881
Branch: refs/heads/0.16-dev
Commit: 1584c8816d2eca8a03e184122aed7dc4e719a29e
Parents: aa5bb7b a1855a0
Author: acton393 <zh...@gmail.com>
Authored: Thu Aug 24 18:36:34 2017 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Thu Aug 24 18:36:34 2017 +0800
----------------------------------------------------------------------
ios/sdk/WeexSDK.xcodeproj/project.pbxproj | 20 ++-
.../WeexSDK/Sources/Component/WXAComponent.m | 1 +
.../Sources/Component/WXComponent_internal.h | 1 +
.../Sources/Component/WXCycleSliderComponent.m | 56 +++++++
.../Sources/Component/WXImageComponent.m | 1 +
.../Sources/Component/WXSliderComponent.m | 53 +++++++
.../Component/WXSliderNeighborComponent.m | 14 ++
.../Sources/Component/WXSwitchComponent.m | 1 +
.../Sources/Component/WXTextAreaComponent.m | 3 +
.../WeexSDK/Sources/Component/WXTextComponent.m | 18 ++-
ios/sdk/WeexSDK/Sources/Engine/WXSDKEngine.m | 1 +
.../Sources/Manager/WXDatePickerManager.m | 8 +
.../WeexSDK/Sources/Manager/WXTracingManager.m | 2 +-
ios/sdk/WeexSDK/Sources/Model/WXComponent.m | 23 ++-
ios/sdk/WeexSDK/Sources/Module/WXPickerModule.m | 44 ++++++
.../WeexSDK/Sources/Module/WXVoiceOverModule.h | 25 ++++
.../WeexSDK/Sources/Module/WXVoiceOverModule.m | 148 +++++++++++++++++++
ios/sdk/WeexSDK/Sources/WeexSDK.h | 2 +
18 files changed, 407 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1584c881/ios/sdk/WeexSDK/Sources/Component/WXImageComponent.m
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/1584c881/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
----------------------------------------------------------------------
diff --cc ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
index d5535c6,835faf6..17c2786
--- a/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
+++ b/ios/sdk/WeexSDK/Sources/Component/WXTextComponent.m
@@@ -273,8 -280,10 +281,10 @@@ do {
useCoreText = [(WXTextComponent*)self.view.wx_component useCoreText];
}
if (!useCoreText) {
- ((WXText *)self.view).textStorage = _textStorage;
+ ((WXTextView *)self.view).textStorage = _textStorage;
}
+ self.view.isAccessibilityElement = YES;
+
[self setNeedsDisplay];
}