fixed usage of Object.assign for older browsers

yocontra · Feb 1, 2016 · ce639c9 · ce639c9
1 parent cfff39a
commit ce639c9
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/dist/react-responsive.js b/dist/react-responsive.js
@@ -19354,6 +19354,7 @@ var matchMedia = require('matchmedia');
 var hyphenate = require('hyphenate-style-name');
 var mediaQuery = require('./mediaQuery');
 var toQuery = require('./toQuery');
+var assign = require('object-assign');
 
 var defaultTypes = {
   component: React.PropTypes.node,
@@ -19366,7 +19367,7 @@ var excludedQueryKeys = Object.keys(defaultTypes);
 var excludedPropKeys = excludedQueryKeys.concat(mediaKeys);
 
 function omit(object, keys){
-  var newObject = Object.assign({}, object);
+  var newObject = assign({}, object);
   keys.forEach(function(key){
     delete newObject[key];
   });
@@ -19462,7 +19463,7 @@ var mq = React.createClass({
 
 module.exports = mq;
 
-},{"./mediaQuery":"/Users/pekeler/Projects/react-responsive/src/mediaQuery.js","./toQuery":"/Users/pekeler/Projects/react-responsive/src/toQuery.js","hyphenate-style-name":"/Users/pekeler/Projects/react-responsive/node_modules/hyphenate-style-name/index.js","matchmedia":"/Users/pekeler/Projects/react-responsive/node_modules/matchmedia/index.js","react":"/Users/pekeler/Projects/react-responsive/node_modules/react/react.js"}],"/Users/pekeler/Projects/react-responsive/src/mediaQuery.js":[function(require,module,exports){
+},{"./mediaQuery":"/Users/pekeler/Projects/react-responsive/src/mediaQuery.js","./toQuery":"/Users/pekeler/Projects/react-responsive/src/toQuery.js","hyphenate-style-name":"/Users/pekeler/Projects/react-responsive/node_modules/hyphenate-style-name/index.js","matchmedia":"/Users/pekeler/Projects/react-responsive/node_modules/matchmedia/index.js","object-assign":"/Users/pekeler/Projects/react-responsive/node_modules/object-assign/index.js","react":"/Users/pekeler/Projects/react-responsive/node_modules/react/react.js"}],"/Users/pekeler/Projects/react-responsive/src/mediaQuery.js":[function(require,module,exports){
 var PropTypes = require('react').PropTypes;
 var assign = require('object-assign');
 

diff --git a/dist/react-responsive.js.map b/dist/react-responsive.js.map
diff --git a/samples/sandbox/dist/sample.js b/samples/sandbox/dist/sample.js
@@ -19404,6 +19404,7 @@ var matchMedia = require('matchmedia');
 var hyphenate = require('hyphenate-style-name');
 var mediaQuery = require('./mediaQuery');
 var toQuery = require('./toQuery');
+var assign = require('object-assign');
 
 var defaultTypes = {
   component: React.PropTypes.node,
@@ -19416,7 +19417,7 @@ var excludedQueryKeys = Object.keys(defaultTypes);
 var excludedPropKeys = excludedQueryKeys.concat(mediaKeys);
 
 function omit(object, keys){
-  var newObject = Object.assign({}, object);
+  var newObject = assign({}, object);
   keys.forEach(function(key){
     delete newObject[key];
   });
@@ -19512,7 +19513,7 @@ var mq = React.createClass({
 
 module.exports = mq;
 
-},{"./mediaQuery":"/Users/pekeler/Projects/react-responsive/src/mediaQuery.js","./toQuery":"/Users/pekeler/Projects/react-responsive/src/toQuery.js","hyphenate-style-name":"/Users/pekeler/Projects/react-responsive/node_modules/hyphenate-style-name/index.js","matchmedia":"/Users/pekeler/Projects/react-responsive/node_modules/matchmedia/index.js","react":"/Users/pekeler/Projects/react-responsive/node_modules/react/react.js"}],"/Users/pekeler/Projects/react-responsive/src/mediaQuery.js":[function(require,module,exports){
+},{"./mediaQuery":"/Users/pekeler/Projects/react-responsive/src/mediaQuery.js","./toQuery":"/Users/pekeler/Projects/react-responsive/src/toQuery.js","hyphenate-style-name":"/Users/pekeler/Projects/react-responsive/node_modules/hyphenate-style-name/index.js","matchmedia":"/Users/pekeler/Projects/react-responsive/node_modules/matchmedia/index.js","object-assign":"/Users/pekeler/Projects/react-responsive/node_modules/object-assign/index.js","react":"/Users/pekeler/Projects/react-responsive/node_modules/react/react.js"}],"/Users/pekeler/Projects/react-responsive/src/mediaQuery.js":[function(require,module,exports){
 var PropTypes = require('react').PropTypes;
 var assign = require('object-assign');
 

diff --git a/samples/sandbox/dist/sample.js.map b/samples/sandbox/dist/sample.js.map
diff --git a/src/index.js b/src/index.js
@@ -5,6 +5,7 @@ var matchMedia = require('matchmedia');
 var hyphenate = require('hyphenate-style-name');
 var mediaQuery = require('./mediaQuery');
 var toQuery = require('./toQuery');
+var assign = require('object-assign');
 
 var defaultTypes = {
   component: React.PropTypes.node,
@@ -17,7 +18,7 @@ var excludedQueryKeys = Object.keys(defaultTypes);
 var excludedPropKeys = excludedQueryKeys.concat(mediaKeys);
 
 function omit(object, keys){
-  var newObject = Object.assign({}, object);
+  var newObject = assign({}, object);
   keys.forEach(function(key){
     delete newObject[key];
   });