diff options
author | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-14 20:49:04 +0100 |
---|---|---|
committer | Hans van den Elsen <hans.elsen@esds.nl> | 2016-03-14 20:49:04 +0100 |
commit | 7fd1c08dd2f789ddd37ff075a6ebda1645947616 (patch) | |
tree | 75b715e6dd70f6be3357e1710c4db6f1f6a1e29e /web/app/view/MapController.js | |
parent | 4606737cc07b736f9c8f98ae680b928c94c082c8 (diff) | |
parent | 0a1019b59481b6bf8ee8989feb23cef084b6caf5 (diff) | |
download | trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.tar.gz trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.tar.bz2 trackermap-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.zip |
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'web/app/view/MapController.js')
-rw-r--r-- | web/app/view/MapController.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/app/view/MapController.js b/web/app/view/MapController.js index 918f81390..b8b7290b8 100644 --- a/web/app/view/MapController.js +++ b/web/app/view/MapController.js @@ -170,7 +170,7 @@ Ext.define('Traccar.view.MapController', { style = this.getReportMarker(); style.getImage().setRotation(position.get('course') * Math.PI / 180); /*style.getText().setText( - Ext.Date.format(position.get('fixTime'), Traccar.Style.dateTimeFormat));*/ + Ext.Date.format(position.get('fixTime'), Traccar.Style.dateTimeFormat24));*/ marker.setStyle(style); |