Skip to content

Commit

Permalink
2015-02-07 updates
Browse files Browse the repository at this point in the history
- Random little fixes | Andres Suarez
- Add backButtonTitle to Navigator | Nick Poulden
- [react-pacakger] Ignore malformed package.json | Amjad Masad
- Renamed hasMove to hasMark | Rich Seymour
- Update XMLHttpRequest.ios.js | Nick Poulden
- Warn about missing dependencies for issue #16 | Andrew McCloud
  • Loading branch information
vjeux committed Feb 8, 2015
1 parent 36a7ec2 commit 7ad85c9
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 10 deletions.
19 changes: 14 additions & 5 deletions TicTacToe/TicTacToeApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class Board {
return this;
}

hasMove(row: number, col: number): boolean {
hasMark(row: number, col: number): boolean {
return this.grid[row][col] !== 0;
}

Expand Down Expand Up @@ -132,7 +132,10 @@ var Cell = React.createClass({

render() {
return (
<TouchableHighlight onPress={this.props.onPress} underlayColor={'clear'} activeOpacity={0.5}>
<TouchableHighlight
onPress={this.props.onPress}
underlayColor="transparent"
activeOpacity={0.5}>
<View style={[styles.cell, this.cellStyle()]}>
<Image source={{uri: this.imageContents()}} />
</View>
Expand Down Expand Up @@ -161,7 +164,10 @@ var GameEndOverlay = React.createClass({
return (
<View style={styles.overlay}>
<Text style={styles.overlayMessage}>{message}</Text>
<TouchableHighlight onPress={this.props.onRestart} underlayColor={'clear'} activeOpacity={0.5}>
<TouchableHighlight
onPress={this.props.onRestart}
underlayColor="transparent"
activeOpacity={0.5}>
<View style={styles.newGame}>
<Text style={styles.newGameText}>New Game</Text>
</View>
Expand All @@ -185,7 +191,7 @@ var TicTacToeApp = React.createClass({
},

handleCellPress(row: number, col: number) {
if (this.state.board.hasMove(row, col)) {
if (this.state.board.hasMark(row, col)) {
return;
}

Expand Down Expand Up @@ -214,7 +220,10 @@ var TicTacToeApp = React.createClass({
<View style={styles.board}>
{rows}
</View>
<GameEndOverlay board={this.state.board} onRestart={this.restartGame} />
<GameEndOverlay
board={this.state.board}
onRestart={this.restartGame}
/>
</View>
);
}
Expand Down
2 changes: 1 addition & 1 deletion UIExplorer/LayoutExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ var LayoutExample = React.createClass({
</UIExplorerBlock>
<UIExplorerBlock title="Flex Wrap">
<CircleBlock style={{flexWrap: 'wrap'}}>
{'oooooooooooooooo'.split('').map(() => <Circle />)}
{'oooooooooooooooo'.split('').map((char, i) => <Circle key={i} />)}
</CircleBlock>
</UIExplorerBlock>
</UIExplorerPage>
Expand Down
1 change: 1 addition & 0 deletions UIExplorer/NavigatorIOSExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ var NavigatorIOSExample = React.createClass({
this.props.navigator.push({
title: NavigatorIOSExample.title,
component: NavigatorIOSExample,
backButtonTitle: 'Custom Back',
passProps: {topExampleRoute: this.props.topExampleRoute || this.props.route},
});
})}
Expand Down
2 changes: 1 addition & 1 deletion UIExplorer/ScrollViewExample.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var Thumb = React.createClass({

var THUMBS = ['https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-ash3/t39.1997/p128x128/851549_767334479959628_274486868_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-prn1/t39.1997/p128x128/851561_767334496626293_1958532586_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-ash3/t39.1997/p128x128/851579_767334503292959_179092627_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-prn1/t39.1997/p128x128/851589_767334513292958_1747022277_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-prn1/t39.1997/p128x128/851563_767334559959620_1193692107_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-prn1/t39.1997/p128x128/851593_767334566626286_1953955109_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-prn1/t39.1997/p128x128/851591_767334523292957_797560749_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-prn1/t39.1997/p128x128/851567_767334529959623_843148472_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-prn1/t39.1997/p128x128/851548_767334489959627_794462220_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-prn1/t39.1997/p128x128/851575_767334539959622_441598241_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-ash3/t39.1997/p128x128/851573_767334549959621_534583464_n.png', 'https://fbcdn-dragon-a.akamaihd.net/hphotos-ak-prn1/t39.1997/p128x128/851583_767334573292952_1519550680_n.png'];
THUMBS = THUMBS.concat(THUMBS); // double length of THUMBS
var createThumbRow = (uri, i) => <Thumb uri={uri}/>;
var createThumbRow = (uri, i) => <Thumb key={i} uri={uri} />;

var styles = StyleSheet.create({
scrollView: {
Expand Down
4 changes: 2 additions & 2 deletions UIExplorer/UIExplorerList.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ var UIExplorerList = React.createClass({
);
},

_renderRow: function(example) {
_renderRow: function(example, i) {
invariant(example.title, 'Example must provide a title.');
return (
<View>
<View key={i}>
<TouchableHighlight onPress={() => this._onPressRow(example)}>
<View style={styles.row}>
<Text style={styles.rowTitleText}>
Expand Down
3 changes: 2 additions & 1 deletion UIExplorer/createExamplePage.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var createExamplePage = function(title, exampleModule) {
description: exampleModule.description,
},

getBlock: function(example) {
getBlock: function(example, i) {
// Hack warning: This is a hack because the www UI explorer requires
// renderComponent to be called.
var originalRenderComponent = React.renderComponent;
Expand All @@ -37,6 +37,7 @@ var createExamplePage = function(title, exampleModule) {
React.render = originalRender;
return (
<UIExplorerBlock
key={i}
title={example.title}
description={example.description}>
{renderedComponent}
Expand Down

0 comments on commit 7ad85c9

Please sign in to comment.