Merge pull request #84 from jim-lake/master

video breaks on react-native 0.9.0-rc
This commit is contained in:
Brent Vatne 2015-08-07 23:59:25 -07:00
commit b406d73dec

View File

@ -80,7 +80,7 @@ var Video = React.createClass({
resizeMode = NativeModules.VideoManager.ScaleNone; resizeMode = NativeModules.VideoManager.ScaleNone;
} }
var nativeProps = merge(this.props, { var nativeProps = merge({},this.props, {
style, style,
resizeMode: resizeMode, resizeMode: resizeMode,
src: { src: {