Merge pull request #92 from refinery29/fix_merging_props
Use lodash instead of merge, unbreaking the component (for us)
This commit is contained in:
commit
74ea1c28a5
@ -2,7 +2,7 @@ var React = require('react-native');
|
|||||||
var { StyleSheet, requireNativeComponent, PropTypes, NativeModules, } = React;
|
var { StyleSheet, requireNativeComponent, PropTypes, NativeModules, } = React;
|
||||||
|
|
||||||
var VideoResizeMode = require('./VideoResizeMode');
|
var VideoResizeMode = require('./VideoResizeMode');
|
||||||
var merge = require('merge');
|
var { extend } = require('lodash');
|
||||||
|
|
||||||
var VIDEO_REF = 'video';
|
var VIDEO_REF = 'video';
|
||||||
|
|
||||||
@ -80,7 +80,7 @@ var Video = React.createClass({
|
|||||||
resizeMode = NativeModules.VideoManager.ScaleNone;
|
resizeMode = NativeModules.VideoManager.ScaleNone;
|
||||||
}
|
}
|
||||||
|
|
||||||
var nativeProps = merge({},this.props, {
|
var nativeProps = extend({}, this.props, {
|
||||||
style,
|
style,
|
||||||
resizeMode: resizeMode,
|
resizeMode: resizeMode,
|
||||||
src: {
|
src: {
|
||||||
|
@ -31,6 +31,6 @@
|
|||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"keymirror": "^0.1.1",
|
"keymirror": "^0.1.1",
|
||||||
"merge": "^1.2.0"
|
"lodash": "^3.10.1"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user