Merge pull request #1595 from dhrubomoy/timezone_dropdown_feature

[CLOCK] Allow clock to set timezone with autocomplete dropdown option.
This commit is contained in:
Victor Woeltjen
2017-06-26 16:51:30 -05:00
committed by GitHub
11 changed files with 360 additions and 29 deletions

View File

@@ -21,6 +21,7 @@
*****************************************************************************/
define([
"moment-timezone",
"./src/indicators/ClockIndicator",
"./src/services/TickerService",
"./src/controllers/ClockController",
@@ -34,6 +35,7 @@ define([
"text!./res/templates/timer.html",
'legacyRegistry'
], function (
MomentTimezone,
ClockIndicator,
TickerService,
ClockController,
@@ -226,13 +228,20 @@ define([
"cssClass": "l-inline"
}
]
},
{
"key": "timezone",
"name": "Timezone",
"control": "autocomplete",
"options": MomentTimezone.tz.names()
}
],
"model": {
"clockFormat": [
"YYYY/MM/DD hh:mm:ss",
"clock12"
]
],
"timezone": "UTC"
}
},
{