Skip to content

Commit

Permalink
Replaced Object.assign with polyfill. Fixes #41
Browse files Browse the repository at this point in the history
  • Loading branch information
ceram1 committed Nov 7, 2015
1 parent aa22c1d commit 25bc10c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion docs/app/components/preview/index.jsx
Expand Up @@ -2,8 +2,11 @@ import React from 'react';
import ReactDOM from 'react-dom';
import babel from 'babel-core/browser';
import ReactToolbox from 'react-toolbox';
import assignPolyfill from 'object.assign/polyfill';
import style from './style';

const assign = assignPolyfill();

const ERROR_TIMEOUT = 500;

const Preview = React.createClass({
Expand All @@ -16,7 +19,7 @@ const Preview = React.createClass({
getDefaultProps () {
return {
className: '',
scope: Object.assign({ React }, ReactToolbox)
scope: assign({ React }, ReactToolbox)
};
},

Expand Down
5 changes: 4 additions & 1 deletion package.json
Expand Up @@ -88,5 +88,8 @@
"webpack-dev-middleware": "^1.2.0",
"webpack-hot-middleware": "^2.4.1"
},
"repository": "github:react-toolbox/react-toolbox"
"repository": "github:react-toolbox/react-toolbox",
"dependencies": {
"object.assign": "^4.0.3"
}
}

0 comments on commit 25bc10c

Please sign in to comment.