Merge pull request #228 from goatslacker/make-our-own-assign

Make our own assign
goatslacker · May 8, 2015 · 5ccab76 · 5ccab76
2 parents ec3ab3e + db90275
commit 5ccab76
Show file tree

Hide file tree

Showing 19 changed files with 342 additions and 316 deletions.
diff --git a/components/AltContainer.js b/components/AltContainer.js
@@ -56,7 +56,7 @@
  */
 var React = require('react/addons')
 var mixinContainer = require('./mixinContainer')
-var assign = require('object-assign')
+var assign = require('../utils/functions').assign
 
 var AltContainer = React.createClass(assign({
  displayName: 'AltContainer',

diff --git a/components/AltNativeContainer.js b/components/AltNativeContainer.js
@@ -5,7 +5,7 @@
  */
 var React = require('react-native')
 var mixinContainer = require('./mixinContainer')
-var assign = require('object-assign')
+var assign = require('../utils/functions').assign
 
 var AltNativeContainer = React.createClass(assign({
  displayName: 'AltNativeContainer',

diff --git a/components/mixinContainer.js b/components/mixinContainer.js
@@ -1,5 +1,5 @@
 var Subscribe = require('../mixins/Subscribe')
-var assign = require('object-assign')
+var assign = require('../utils/functions').assign
 
 function id(it) {
  return it