Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-01-31 00:16:47 +01:00
Code Issues Projects Releases Wiki Activity

Improve date formatting in log view.

Browse Source
This commit is contained in:
Jari Bakken 2015-02-04 17:47:37 +00:00 committed by Ivar Conradi Østhus
parent 12710a6d04
commit c15b72666b
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package.json
View File

@ -45,6 +45,7 @@
"jsxhint": "0.4.15", "jsxhint": "0.4.15",
"knex": "^0.7.3", "knex": "^0.7.3",
"log4js": "0.6.21", "log4js": "0.6.21",
"moment": "^2.9.0",
"nconf": "0.6.9", "nconf": "0.6.9",
"pg": "3.6.1", "pg": "3.6.1",
"react": "^0.12.0", "react": "^0.12.0",
@ -68,7 +69,12 @@
}, },
"jest": { "jest": {
"scriptPreprocessor": "<rootDir>/jest-preprocessor.js", "scriptPreprocessor": "<rootDir>/jest-preprocessor.js",
"unmockedModulePathPatterns": ["<rootDir>/node_modules/react"], "unmockedModulePathPatterns": [
"moduleFileExtensions": ["jsx", "js"] "<rootDir>/node_modules/react"
],
"moduleFileExtensions": [
"jsx",
"js"
]
} }
} }

7
public/js/components/log/LogEntry.jsx
View File

@ -1,4 +1,5 @@
var React = require('react'); var React = require('react');
var moment = require('moment');
var DIFF_PREFIXES = { var DIFF_PREFIXES = {
A: ' ', A: ' ',
@ -20,13 +21,13 @@ var LogEntry = React.createClass({
}, },
render: function() { render: function() {
var d = new Date(this.props.event.createdAt); var date = moment(this.props.event.createdAt);
return ( return (
<tr> <tr>
<td> <td>
{d.getDate() + "." + (d.getMonth() + 1) + "." + d.getFullYear()}<br /> {date.format('ll')}<br />
kl. {d.getHours() + "." + d.getMinutes()} {date.format('HH:mm')}
</td> </td>
<td> <td>
<strong>{this.props.event.data.name}</strong><em>[{this.props.event.type}]</em> <strong>{this.props.event.data.name}</strong><em>[{this.props.event.type}]</em>