Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.8 stable test #22253

Closed
wants to merge 10 commits into from
Closed

0.8 stable test #22253

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
0cb1312
Rename babel's es6.parameters.rest option to es6.parameters
evansolomon Jun 26, 2015
12cae9a
Bump babel-core version to enforce params option name change
evansolomon Jun 26, 2015
e5358b5
Update version numbers in package.json and React.podspec to 0.8.0-rc
ide Jul 10, 2015
b59f173
Issues/#1689 text input warning
admmasters Jul 15, 2015
95608da
[ListView] Operate on the true scroll responder instead of the scroll…
ide Jul 13, 2015
d4af948
[ReactNative] Fix crash in ListView
sahrens Jul 13, 2015
2858a10
revert [React Native] Fix scroll view sticky headers
sahrens Jul 16, 2015
8ef7a50
Reverted ca9d1b3bf5a6f46ec29babe8685634690ff9a2bc to unbreak groups
sahrens Jul 17, 2015
c6cf3d9
0.8.0-rc.2
ide Jul 17, 2015
a767c7b
Bump to 0.8.0
brentvatne Jul 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[ReactNative] Fix crash in ListView
  • Loading branch information
@sahrens @ide
sahrens authored and ide committed Jul 16, 2015
commit d4af94826112e94544bbb0c48bebdc39ff40e2ad
7 changes: 6 additions & 1 deletion Libraries/CustomComponents/ListView/ListView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,9 @@ var ListView = React.createClass({
* such as scrollTo.
*/
getScrollResponder: function() {
return this.refs[SCROLLVIEW_REF].getScrollResponder();
return this.refs[SCROLLVIEW_REF] &&
this.refs[SCROLLVIEW_REF].getScrollResponder &&
this.refs[SCROLLVIEW_REF].getScrollResponder();
},

setNativeProps: function(props) {
Expand Down Expand Up @@ -400,6 +402,9 @@ var ListView = React.createClass({

_measureAndUpdateScrollProps: function() {
var scrollComponent = this.getScrollResponder();
if (!scrollComponent || !scrollComponent.getInnerViewNode) {
return;
}
RCTUIManager.measureLayout(
scrollComponent.getInnerViewNode(),
React.findNodeHandle(scrollComponent),
Expand Down
4 changes: 2 additions & 2 deletions Libraries/Utilities/MessageQueue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,8 @@ class MessageQueue {
let callback = this._callbacks[cbID];
if (__DEV__) {
let debug = this._debugInfo[cbID >> 1];
let module = this._remoteModuleTable[debug[0]];
let method = this._remoteMethodTable[debug[0]][debug[1]];
let module = debug && this._remoteModuleTable[debug[0]];
let method = debug && this._remoteMethodTable[debug[0]][debug[1]];
if (!callback) {
console.error(`Callback with id ${cbID}: ${module}.${method}() not found`);
} else if (SPY_MODE) {
Expand Down