Merge branch 'master' of github.com:scotch-io/react-tweets into github

Chris Sevilleja · Chris Sevilleja · commit 3358fe356263 · 2014-10-23T09:01:21.000-07:00
diff --git a/components/Tweets.react.js b/components/Tweets.react.js
@@ -11,7 +11,7 @@ module.exports = Tweets = React.createClass({
     // Build list items of single tweet components using map
     var content = this.props.tweets.map(function(tweet){
       return (
-        <Tweet key={tweet.twid} tweet={tweet} />
+        <Tweet key={tweet._id} tweet={tweet} />
       )
     });
 
@@ -22,4 +22,4 @@ module.exports = Tweets = React.createClass({
 
   }
 
-});
+}); 
diff --git a/components/TweetsApp.react.js b/components/TweetsApp.react.js
@@ -110,7 +110,7 @@ module.exports = TweetsApp = React.createClass({
 
     // Get scroll pos & window data
     var h = Math.max(document.documentElement.clientHeight, window.innerHeight || 0);
-    var s = (document.body.scrollTop, document.documentElement.scrollTop || 0);
+    var s = (document.body.scrollTop || document.documentElement.scrollTop || 0);
     var scrolled = (h + s) > document.body.offsetHeight;
 
     // If scrolled enough, not currently paging and not complete...

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ module.exports = Tweets = React.createClass({`
`11`	`11`	`// Build list items of single tweet components using map`
`12`	`12`	`var content = this.props.tweets.map(function(tweet){`
`13`	`13`	`return (`
`14`		`- <Tweet key={tweet.twid} tweet={tweet} />`
	`14`	`+ <Tweet key={tweet._id} tweet={tweet} />`
`15`	`15`	`)`
`16`	`16`	`});`
`17`	`17`
`@@ -22,4 +22,4 @@ module.exports = Tweets = React.createClass({`
`22`	`22`
`23`	`23`	`}`
`24`	`24`
`25`		`-});`
	`25`	`+});`