scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-02-17 00:21:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #663 from rschamp/feature/remove-warnings

Browse source 
Get rid of most splash warnings in development
This commit is contained in:
Ray Schamp 2016-07-03 16:01:08 -04:00 committed by GitHub
commit bfd8bcd682
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/carousel/carousel.jsx
View file

@ -55,7 +55,7 @@ var Carousel = React.createClass({
}
return (
<Thumbnail key={item.id}
<Thumbnail key={[this.key, item.id].join('.')}
showLoves={this.props.showLoves}
showRemixes={this.props.showRemixes}
type={item.type}

2
src/components/navigation/www/navigation.jsx
View file

@ -266,7 +266,7 @@ var Navigation = React.createClass({
</a>
</li>
{this.props.permissions.educator ? [
<li>
<li key="my-classes-li">
<a href="/educators/classes/">
<FormattedMessage id="general.myClasses" />
</a>

10
src/components/teacher-banner/teacher-banner.jsx
View file

@ -35,11 +35,11 @@ var TeacherBanner = React.createClass({
<div className="welcome">
{this.props.session.status === sessionActions.Status.FETCHED ? (
this.props.session.session.user ? [
<h3>
<h3 key="greeting">
{this.props.messages['teacherbanner.greeting']},{' '}
{this.props.session.session.user.username}
</h3>,
<p>
<p key="subgreeting">
{this.props.messages['teacherbanner.subgreeting']}
</p>
] : []
@ -48,17 +48,17 @@ var TeacherBanner = React.createClass({
<FlexRow className="quick-links">
{this.props.session.status === sessionActions.Status.FETCHED ? (
this.props.session.session.user ? [
<a href="/educators/classes">
<a href="/educators/classes" key="classes-button">
<Button>
{this.props.messages['teacherbanner.classesButton']}
</Button>
</a>,
<a href="/info/educators">
<a href="/info/educators" key="resources-button">
<Button>
{this.props.messages['teacherbanner.resourcesButton']}
</Button>
</a>,
<a href="/educators/faq">
<a href="/educators/faq" key="faq-button">
<Button>
{this.props.messages['teacherbanner.faqButton']}
</Button>

2
src/views/splash/splash.jsx
View file

@ -377,7 +377,7 @@ var Splash = injectIntl(React.createClass({
</Modal>
] : []}
{this.props.permissions.educator ? [
<TeacherBanner messages={messages} />
<TeacherBanner key="teacherbanner" messages={messages} />
] : []}
<div key="inner" className="inner">
{this.props.session.status === sessionActions.Status.FETCHED ? (