railbird/react-native-video
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use lodash instead of merge, because the latter is ignoring one of the params passed in

Browse Source
This commit is contained in:
Carlo Francisco 2015-09-16 17:36:17 -04:00
parent 1f0ba1347b
commit 3d96525558
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Video.ios.js
View File

@ -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: {

2
package.json
View File

@ -31,6 +31,6 @@
}, },
"dependencies": { "dependencies": {
"keymirror": "^0.1.1", "keymirror": "^0.1.1",
"merge": "^1.2.0" "lodash": "^3.10.1"
} }
} }