Commit 74ea1c28 authored by Brent Vatne's avatar Brent Vatne
Browse files

Merge pull request #92 from refinery29/fix_merging_props 

Use lodash instead of merge, unbreaking the component (for us)
parents 1f0ba134 3d965255

Video.ios.js

+2 −2
Changes for Video.ios.js: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ var React = require('react-native'); 
var { StyleSheet, requireNativeComponent, PropTypes, NativeModules, } = React;



var VideoResizeMode = require('./VideoResizeMode');

var merge = require('merge');

var { extend } = require('lodash');



var VIDEO_REF = 'video';
@@ -80,7 +80,7 @@ var Video = React.createClass({ 
      resizeMode = NativeModules.VideoManager.ScaleNone;

    }



    var nativeProps = merge({},this.props, {

    var nativeProps = extend({}, this.props, {

      style,

      resizeMode: resizeMode,

      src: {

package.json

+1 −1
Changes for package.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -31,6 +31,6 @@ 
  },

  "dependencies": {

    "keymirror": "^0.1.1",

    "merge": "^1.2.0"

    "lodash": "^3.10.1"

  }

}