ff-stream-web

commit dbcb321d596e64698a2aed81dd732948bf1d357c
parent 977c82ed752374fdf2915d08c3ec6f361cf0d9a9
Author: Konstantin Tarkus <hello@tarkus.me>
Date:   Mon, 10 Nov 2014 23:31:03 +0300

Replace _.extend() with ES6 Object.assign() polyfill

Diffstat:
M
package.json
 | 
2
+-
M
src/AppDispatcher.js
 | 
4
++--
M
src/app.js
 | 
4
++--

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "bootstrap": "^3.3.0",
     "director": "^1.2.3",
     "flux": "^2.0.1",
-    "lodash": "^2.4.1",
+    "object-assign": "^1.0.0",
     "react": "^0.12.0"
   },
   "devDependencies": {
diff --git a/src/AppDispatcher.js b/src/AppDispatcher.js
@@ -5,11 +5,11 @@
 
 'use strict';
 
-var _ = require('lodash');
 var {Dispatcher} = require('flux');
 var PayloadSources = require('./constants/PayloadSources');
+var assign = require('object-assign');
 
-var AppDispatcher = _.extend(new Dispatcher(), {
+var AppDispatcher = assign(new Dispatcher(), {
 
   /**
    * @param {object} action The details of the action, including the action's
diff --git a/src/app.js b/src/app.js
@@ -5,11 +5,11 @@
 
 'use strict';
 
-var _ = require('lodash');
 var React = require('react');
 var {Router} = require('director');
 var AppDispatcher = require('./AppDispatcher');
 var ActionTypes = require('./constants/ActionTypes');
+var assign = require('object-assign');
 
 // Export React so the dev tools can find it
 (window !== window.top ? window.top : window).React = React;
@@ -22,7 +22,7 @@ function render(page) {
   var child = null, props = {};
   while (page.defaultProps && page.defaultProps.layout) {
     child = React.createElement(page, props, child);
-    _.extend(props, page.defaultProps);
+    assign(props, page.defaultProps);
     page = page.defaultProps.layout;
   }
   React.render(React.createElement(page, props, child), document.body);