ff-stream-web

commit 9a733b370c57f99bacc20a7451ba34d4638bca43
parent 917afad078dba71116e58dd42a5b0e87c9f72b87
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Wed, 24 Dec 2014 10:14:12 +0300

Replace 'object-assign' with 'react/lib/Object.assign

Diffstat:
M
package.json
 | 
1
-
M
src/actions/PageActions.js
 | 
2
+-
M
src/core/Dispatcher.js
 | 
2
+-
M
src/core/Store.js
 | 
2
+-

4 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
@@ -9,7 +9,6 @@
     "bootstrap": "^3.3.1",
     "director": "^1.2.7",
     "flux": "^2.0.1",
-    "object-assign": "^2.0.0",
     "react": "^0.12.2"
   },
   "devDependencies": {
diff --git a/src/actions/PageActions.js b/src/actions/PageActions.js
@@ -11,7 +11,7 @@
 var Dispatcher = require('../core/Dispatcher');
 var ActionTypes = require('../constants/ActionTypes');
 var pageDefaults = require('../constants/Settings').defaults.page;
-var assign = require('object-assign');
+var assign = require('react/lib/Object.assign');
 
 module.exports = {
 
diff --git a/src/core/Dispatcher.js b/src/core/Dispatcher.js
@@ -10,7 +10,7 @@
 
 var Flux = require('flux');
 var PayloadSources = require('../constants/PayloadSources');
-var assign = require('object-assign');
+var assign = require('react/lib/Object.assign');
 
 /**
  * A singleton that operates as the central hub for application updates.
diff --git a/src/core/Store.js b/src/core/Store.js
@@ -9,7 +9,7 @@
 'use strict';
 
 var EventEmitter = require('events').EventEmitter;
-var assign = require('object-assign');
+var assign = require('react/lib/Object.assign');
 var invariant = require('react/lib/invariant');
 
 var CHANGE_EVENT = 'change';