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-17554] TiAPI: Support "full" date format #6880

Merged
merged 3 commits into from
Jun 1, 2015
Merged

[TIMOB-17554] TiAPI: Support "full" date format #6880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fe43d7
Update KrollContext.m
dethier1958 May 1, 2014
c7adb90
Merge branch 'patch-1' of https://github.com/dethier1958/titanium_mob…
cheekiatng May 28, 2015
efdc1bb
added android full dateFormat
cheekiatng May 28, 2015
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 android/titanium/src/java/ti/modules/titanium/TitaniumModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ public String stringFormatDate(Date date, @Kroll.argument(optional=true) String

} else if (format.equals("long")) {
style = DateFormat.LONG;
} else if (format.equals("full")) {
style = DateFormat.FULL;
}
}

Expand Down
2 changes: 1 addition & 1 deletion apidoc/Global/String/String.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ methods:
type: Date

- name: format
summary: Date format to use. One of 'short', 'medium', or 'long'.
summary: Date format to use. One of 'short', 'medium', 'long' or 'full'.
type: String
optional: true
default: 'short'
Expand Down
4 changes: 4 additions & 0 deletions iphone/Classes/KrollContext.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,6 +498,10 @@ static TiValueRef StringFormatDateCallback (TiContextRef jsContext, TiObjectRef
{
style = NSDateFormatterLongStyle;
}
else if ([s isEqualToString:@"full"])
{
style = NSDateFormatterFullStyle;
}
}

@try
Expand Down