Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-11455] add accessibilityValue/Hint for TableView rows #3224

Merged
merged 6 commits into from
Oct 17, 2012
Merged

[TIMOB-11455] add accessibilityValue/Hint for TableView rows #3224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0313f1
[TIMOB-11455] add accessibilityValue/Hint for TableView rows
Oct 14, 2012
e604968
fix iOS 5.0+ property usage
Oct 14, 2012
8781f78
revert back to use accessibilityElementsHidden; document that it's on…
Oct 16, 2012
485d29c
JS type safety
Oct 16, 2012
fd2753c
Merge remote-tracking branch 'appcelerator/master' into timob-11455
Oct 16, 2012
2004614
avoid unnecessary view creation; use replaceValue:forKey:notification:NO
Oct 16, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions apidoc/Titanium/UI/View.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,6 +740,8 @@ properties:
osver:
android:
min: "4.0"
ios:
min: "5.0"

- name: accessibilityHint
summary: Briefly describes what performing an action (such as a click) on the view will do.
Expand Down
2 changes: 2 additions & 0 deletions iphone/Classes/TiUITableViewRowProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -755,6 +755,8 @@ -(void)initializeTableViewCell:(UITableViewCell*)cell
[self configureIndentionLevel:cell];
[self configureChildren:cell];
cell.accessibilityLabel = [TiUtils stringValue:[self valueForUndefinedKey:@"accessibilityLabel"]];
cell.accessibilityValue = [TiUtils stringValue:[self valueForUndefinedKey:@"accessibilityValue"]];
cell.accessibilityHint = [TiUtils stringValue:[self valueForUndefinedKey:@"accessibilityHint"]];
modifyingRow = NO;
}

Expand Down
6 changes: 0 additions & 6 deletions iphone/Classes/TiUIView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,12 +657,6 @@ -(BOOL)animating
return animating;
}

-(void)setAccessibilityHidden_:(id)hidden
{
// self and NOT self.accessibilityElement
self.accessibilityElementsHidden = [TiUtils boolValue:hidden def:NO];
}

#pragma mark Property Change Support

-(SEL)selectorForProperty:(NSString*)key
Expand Down
51 changes: 33 additions & 18 deletions iphone/Classes/TiViewProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2724,37 +2724,52 @@ -(TiDimension)defaultAutoHeightBehavior:(id)unused

#pragma mark - Accessibility API

- (void)setAccessibilityLabel:(NSString *)accessibilityLabel
- (void)setAccessibilityLabel:(id)accessibilityLabel
{
ENSURE_UI_THREAD(setAccessibilityLabel, accessibilityLabel);
id accessibilityElement = [self view].accessibilityElement;
if (accessibilityElement != nil) {
[accessibilityElement setIsAccessibilityElement:YES];
[accessibilityElement setAccessibilityLabel:accessibilityLabel];
if ([self viewAttached]) {
id accessibilityElement = [self view].accessibilityElement;
if (accessibilityElement != nil) {
[accessibilityElement setIsAccessibilityElement:YES];
[accessibilityElement setAccessibilityLabel:[TiUtils stringValue:accessibilityLabel]];
}
}
[self setValue:accessibilityLabel forUndefinedKey:@"accessibilityLabel"];
[self replaceValue:accessibilityLabel forKey:@"accessibilityLabel" notification:NO];
}

- (void)setAccessibilityValue:(NSString *)accessibilityValue
- (void)setAccessibilityValue:(id)accessibilityValue
{
ENSURE_UI_THREAD(setAccessibilityValue, accessibilityValue);
id accessibilityElement = [self view].accessibilityElement;
if (accessibilityElement != nil) {
[accessibilityElement setIsAccessibilityElement:YES];
[accessibilityElement setAccessibilityValue:accessibilityValue];
if ([self viewAttached]) {
id accessibilityElement = [self view].accessibilityElement;
if (accessibilityElement != nil) {
[accessibilityElement setIsAccessibilityElement:YES];
[accessibilityElement setAccessibilityValue:[TiUtils stringValue:accessibilityValue]];
}
}
[self setValue:accessibilityValue forUndefinedKey:@"accessibilityValue"];
[self replaceValue:accessibilityValue forKey:@"accessibilityValue" notification:NO];
}

- (void)setAccessibilityHint:(NSString *)accessibilityHint
- (void)setAccessibilityHint:(id)accessibilityHint
{
ENSURE_UI_THREAD(setAccessibilityHint, accessibilityHint);
id accessibilityElement = [self view].accessibilityElement;
if (accessibilityElement != nil) {
[accessibilityElement setIsAccessibilityElement:YES];
[accessibilityElement setAccessibilityHint:accessibilityHint];
if ([self viewAttached]) {
id accessibilityElement = [self view].accessibilityElement;
if (accessibilityElement != nil) {
[accessibilityElement setIsAccessibilityElement:YES];
[accessibilityElement setAccessibilityHint:[TiUtils stringValue:accessibilityHint]];
}
}
[self replaceValue:accessibilityHint forKey:@"accessibilityHint" notification:NO];
}

- (void)setAccessibilityHidden:(id)accessibilityHidden
{
ENSURE_UI_THREAD(setAccessibilityHidden, accessibilityHidden);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if ([self viewAttached] && [TiUtils isIOS5OrGreater] ){
TiThreadPerformOnMainThread(^{ [self view].accessibilityElementsHidden = [TiUtils boolValue:accessibilityHidden def:NO];},NO);
}
[self replaceValue:accessibilityHidden forUndefinedKey:@"accessibilityHidden" notification:NO];

if ([self viewAttached] && [TiUtils isIOS5OrGreater]) {
[self view].accessibilityElementsHidden = [TiUtils boolValue:accessibilityHidden def:NO];
}
[self setValue:accessibilityHint forUndefinedKey:@"accessibilityHint"];
[self replaceValue:accessibilityHidden forKey:@"accessibilityHidden" notification:NO];
}

@end