Timob 4472 Ti.Platform.is24HourTimeFormat() #190
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* master: (53 commits) don't show a dialog if it was hidden while waiting for the current activity to show TIMOB-4138 JS Compiler errors should err out rather than continue the build process. TIMOB-3313 [TIMOB-3631] Never forget: -[NSMutableArray removeObjectAtIndex:] sends autorelease messages, not release. By having the webview's const string static, that avoids namespace conflicts later on. Booyah. TIMOB-4074 # Added placeholder class for JS functions to be a lighter replacement for KrollCallback (And not having retention issues) to sanity-check stored functions as well as allow one context to call another's function. TIMOB-4131 Resolved KitchenSink syntax errors, and warning according to TiStudio TIMOB-4070 #resolve Release the music picker when the popover is dismissed to allow re-entry into openMusicLibrary: Surround fastdev args that have spaces with fullquotes, but only for windows TIMOB-4082 Fastdev script args with spaces need to be surrounded by quotes. TIMOB-4082 generally handle dialogs better in situations that open a window asynchronously. exposed a new internal type TiDialogProxy, and a new helper function TiUIHelper.waitForCurrentActivity(..). this fixes the dialog "sandwiching" problem of ActivityIndicator, OptionDialog, the JS alert, and runtime error dialogs. TIMOB-3644 [TIMOB-2011] Register evaluation errors with the bridge, so that they can be queried later (like during the window opening process.) Don't attempt to send deploy.json to sdcard if production mode or build_only. TIMOB-4133 For compiled js files, replace dashes with underscores in file/class name. TIMOB-4043 Removing documentation for Ti.Filesystem.File.append as it is an internal method in iOS and doesn't exist at all on Android. TIMOB-3385 #resolve Added more Drillbit test coverage to re-affirm that this issue is indeed fixed. Also, we kinda needed it too. ;-) Fixed type issues with Buffer. Removed duplicate setInt method from Ti.App.Properties [TIMOB-3533] - Remember TiProxies that are set as properties - When constructing tables, use the current page context if the execution context is not available yet to register sections/rows. TIMOB-3970 # Make sure the controller's proxy is set nil before being cast off. TIMOB-4025 removed the scaling factor that had been added for 1.5/1.6 devices. 2.1 Eris and Nexus One 2.3.4 work without it now [TIMOB-2317] Turns out that sometimes, multivalue properties don't have a label. Documentation makes it sound otherwise. Short-circuit label evaluation if there isn't one. ...
…t a line in the KS Platform Data test, and add test suite for Platform in Drillbit. TIMOB-4472
| @@ -123,6 +123,11 @@ public class PlatformModule extends KrollModule | |||
| } | |||
|
|
|||
| @Kroll.method | |||
| public boolean is24HourTimeFormat() { | |||
There was a problem hiding this comment.
bracket should be on the next line..
| @@ -123,6 +123,12 @@ public class PlatformModule extends KrollModule | |||
| } | |||
|
|
|||
| @Kroll.method | |||
| public boolean is24HourTimeFormat() | |||
| { | |||
| return TiPlatformHelper.is24HourTimeFormat(getTiContext().getActivity().getApplicationContext()); | |||
There was a problem hiding this comment.
We should probably be getting the application context from TiApplication, and also do a null check here. i.e.:
TiApplication app = TiApplication.getInstance();
if (app != null) {
return TiPlatformHelper.is24HourTimeFormat(app.getApplicationContext());
}
return false;…a null-check. Remove some phantom spaces. TIMOB-4472
…han going through TiPlatformHelper. If we ever want/need it in titanium.jar, we can add it then. Until then, save the extra function call. TIMOB-4472
|
Code review accepted |
|
Code review and functional test. Request Accepted. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Android portion of
http://jira.appcelerator.org/browse/TIMOB-4472
Adds this new api point (merged from gossnj with some mods), a line in the KS Platform - Platform Data test for it, and drillbit test for checking Platform api points including this new one.