[New] Updated StrolchJS.toLocalDateTime() to only add seconds if parameter set
This commit is contained in:
parent
325e4c008b
commit
08e591c315
10
Strolch.js
10
Strolch.js
|
@ -478,11 +478,15 @@ Strolch = {
|
||||||
return date.toLocaleDateString('de-CH')
|
return date.toLocaleDateString('de-CH')
|
||||||
},
|
},
|
||||||
|
|
||||||
toLocalDateTime: function (val) {
|
toLocalDateTime: function (val, withSeconds) {
|
||||||
if (this.isEmptyString(val) || val === '-') return '-';
|
if (this.isEmptyString(val) || val === '-') return '-';
|
||||||
var date = new Date(val);
|
var date = new Date(val);
|
||||||
if (this.props.locale != null) return date.toLocaleDateString(this.props.locale) + ' ' + date.toLocaleTimeString(this.props.locale);
|
var locale = this.props.locale != null ? this.props.locale : "de-CH";
|
||||||
return date.toLocaleDateString('de-CH') + ' ' + date.toLocaleTimeString('de-CH');
|
if (withSeconds) {
|
||||||
|
return date.toLocaleDateString(locale) + ' ' + date.toLocaleTimeString(locale);
|
||||||
|
} else {
|
||||||
|
return date.toLocaleDateString(locale) + ' ' + this.getTimeString(date);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
toDateTime: function (val) {
|
toDateTime: function (val) {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "strolchjs",
|
"name": "strolchjs",
|
||||||
"version": "0.5.2",
|
"version": "0.5.3",
|
||||||
"main": "Strolch.js",
|
"main": "Strolch.js",
|
||||||
"ignore": [
|
"ignore": [
|
||||||
"**/.*",
|
"**/.*",
|
||||||
|
|
Loading…
Reference in New Issue