Skip to content

Commit

Permalink
Updating modules and switching from timeago to react-timeago due to t…
Browse files Browse the repository at this point in the history
…imeago npm change
  • Loading branch information
Justin Slattery committed Aug 28, 2015
1 parent b2ebbd8 commit efaa228
Show file tree
Hide file tree
Showing 12 changed files with 1,398 additions and 920 deletions.
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "carbondream",
"version": "0.0.5",
"version": "0.0.6",
"description": "Reactjs web annotation engine",
"homepage": "http://carbondream.zeroarc.com/",
"main": "dist/entry.js",
Expand Down Expand Up @@ -29,17 +29,17 @@
"url": "https://github.com/ZeroarcSoftware/carbondream/issues"
},
"devDependencies": {
"babel": "^5.4.7",
"babelify": "^6.1.2",
"browserify": "^10.2.3",
"watchify": "^3.2.1"
"babel": "^5.8.21",
"babelify": "^6.2.0",
"browserify": "^11.0.1",
"watchify": "^3.3.1"
},
"dependencies": {
"classnames": "^2.1.2",
"font-awesome": "^4.3.0",
"immutable": "^3.7.3",
"classnames": "^2.1.3",
"font-awesome": "^4.4.0",
"immutable": "^3.7.4",
"react": "^0.13.3",
"reflux": "^0.2.7",
"timeago": "^0.2.0"
"react-timeago": "^2.2.1",
"reflux": "^0.2.12"
}
}
4 changes: 2 additions & 2 deletions src/Content.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
// External
let React = require('react/addons');
let ClassNames = require('classnames');
let Timeago = require('timeago');
let Timeago = require('react-timeago');

// Local
let Input = require('./Input');
Expand Down Expand Up @@ -101,7 +101,7 @@ let Content = React.createClass({
{this.props.content}
</div>
<div className='cd-annotation-content-info'>
Comment #{this.props.id} by {this.props.author} {Timeago(this.props.timeStamp)}
Comment #{this.props.id} by {this.props.author} <Timeago date={this.props.timeStamp} />
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit efaa228

Please sign in to comment.