Format updates when time system selected

This commit is contained in:
Henry
2016-08-01 17:11:01 -07:00
parent ce5d0ef5bd
commit a75ea67b8c
5 changed files with 13 additions and 12 deletions

View File

@ -33,7 +33,7 @@ define([
"extensions": {
"formats": [
{
"key": "local",
"key": "local-format",
"implementation": LocalTimeFormat
}
],

View File

@ -26,11 +26,11 @@ define([
moment
) {
var DATE_FORMAT = "YYYY-MM-DD hh:mm:ss.SSS",
var DATE_FORMAT = "YYYY-MM-DD h:mm:ss.SSS a",
DATE_FORMATS = [
DATE_FORMAT,
"YYYY-MM-DD hh:mm:ss",
"YYYY-MM-DD hh:mm",
"YYYY-MM-DD h:mm:ss a",
"YYYY-MM-DD h:mm a",
"YYYY-MM-DD"
];
@ -67,8 +67,8 @@ define([
return [
[".SSS", function(m) { return m.milliseconds(); }],
[":ss", function(m) { return m.seconds(); }],
["hh:mm", function(m) { return m.minutes(); }],
["hh", function(m) { return m.hours(); }],
["hh:mma", function(m) { return m.minutes(); }],
["hha", function(m) { return m.hours(); }],
["ddd DD", function(m) {
return m.days() &&
m.date() != 1;

View File

@ -42,11 +42,11 @@ define([
*/
this.metadata = {
'key': 'local',
'name': 'Local 12 hour',
'name': 'Local',
'glyph': '\u0043'
};
this._formats = ['utc'];
this._formats = ['local-format'];
this._tickSources = [new LocalClock($timeout, DEFAULT_PERIOD)];
}