kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-29 12:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update with required PRs

Browse Source
This commit is contained in:
Alexsander Akers
2015-07-01 22:05:10 +01:00
parent 44c587e828 5aa27586f0
commit d161640f52
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Examples/Movies/SearchScreen.js
View File

@@ -26,6 +26,8 @@ var {
} = React; } = React;
var TimerMixin = require('react-timer-mixin'); var TimerMixin = require('react-timer-mixin');
var invariant = require('invariant');
var MovieCell = require('./MovieCell'); var MovieCell = require('./MovieCell');
var MovieScreen = require('./MovieScreen'); var MovieScreen = require('./MovieScreen');
@@ -73,18 +75,16 @@ var SearchScreen = React.createClass({
this.searchMovies(''); this.searchMovies('');
}, },
_urlForQueryAndPage: function(query: string, pageNumber: ?number): string { _urlForQueryAndPage: function(query: string, pageNumber: number): string {
var apiKey = API_KEYS[this.state.queryNumber % API_KEYS.length]; var apiKey = API_KEYS[this.state.queryNumber % API_KEYS.length];
if (query) { if (query) {
return ( return (
// $FlowFixMe(>=0.13.0) - pageNumber may be null or undefined
API_URL + 'movies.json?apikey=' + apiKey + '&q=' + API_URL + 'movies.json?apikey=' + apiKey + '&q=' +
encodeURIComponent(query) + '&page_limit=20&page=' + pageNumber encodeURIComponent(query) + '&page_limit=20&page=' + pageNumber
); );
} else { } else {
// With no query, load latest movies // With no query, load latest movies
return ( return (
// $FlowFixMe(>=0.13.0) - pageNumber may be null or undefined
API_URL + 'lists/movies/in_theaters.json?apikey=' + apiKey + API_URL + 'lists/movies/in_theaters.json?apikey=' + apiKey +
'&page_limit=20&page=' + pageNumber '&page_limit=20&page=' + pageNumber
); );
@@ -176,6 +176,7 @@ var SearchScreen = React.createClass({
}); });
var page = resultsCache.nextPageNumberForQuery[query]; var page = resultsCache.nextPageNumberForQuery[query];
invariant(page != null, 'Next page number for "%s" is missing', query);
fetch(this._urlForQueryAndPage(query, page)) fetch(this._urlForQueryAndPage(query, page))
.then((response) => response.json()) .then((response) => response.json())
.catch((error) => { .catch((error) => {

2
packager/react-packager/src/JSTransformer/__tests__/Cache-test.js vendored
View File

@@ -229,7 +229,7 @@ describe('JSTransformer Cache', function() {
return Promise.resolve('baz value'); return Promise.resolve('baz value');
}); });
jest.runAllTicks(); jest.runAllImmediates();
expect(fs.writeFile).toBeCalled(); expect(fs.writeFile).toBeCalled();
}); });
}); });