From f033b8246f28f15f20f2e5da8737e403a54fd031 Mon Sep 17 00:00:00 2001 From: Joon Heo Date: Wed, 14 Sep 2016 14:20:54 -0700 Subject: [PATCH] Updated the syntax to use Object.assign directly instead of referencing it from the react library --- ScrollBlocker.js | 8 +++----- jsx/ScrollBlocker.jsx | 6 ++---- package.json | 4 ++-- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/ScrollBlocker.js b/ScrollBlocker.js index 68db662..6887061 100644 --- a/ScrollBlocker.js +++ b/ScrollBlocker.js @@ -1,6 +1,4 @@ -/** @jsx React.DOM */ var React = require('react'); -var assign = require('react/lib/Object.assign'); var blockerStyle = { pointerEvents: 'none' @@ -21,14 +19,14 @@ var ScrollBlocker = React.createClass({displayName: "ScrollBlocker", }, render: function () { - var { style, active, ...other } = this.props; + var $__0= this.props,style=$__0.style,active=$__0.active,other=(function(source, exclusion) {var rest = {};var hasOwn = Object.prototype.hasOwnProperty;if (source == null) {throw new TypeError();}for (var key in source) {if (hasOwn.call(source, key) && !hasOwn.call(exclusion, key)) {rest[key] = source[key];}}return rest;})($__0,{style:1,active:1}); return ( - React.createElement("div", React.__spread({}, other, {style: assign({}, style, active && blockerStyle)}), + React.createElement("div", React.__spread({}, other, {style: Object.assign({}, style, active && blockerStyle)}), this.props.children ) ); } }); -module.exports = ScrollBlocker; \ No newline at end of file +module.exports = ScrollBlocker; diff --git a/jsx/ScrollBlocker.jsx b/jsx/ScrollBlocker.jsx index 6d4fb6b..f003d3c 100644 --- a/jsx/ScrollBlocker.jsx +++ b/jsx/ScrollBlocker.jsx @@ -1,6 +1,4 @@ -/** @jsx React.DOM */ var React = require('react'); -var assign = require('react/lib/Object.assign'); var blockerStyle = { pointerEvents: 'none' @@ -24,11 +22,11 @@ var ScrollBlocker = React.createClass({ var { style, active, ...other } = this.props; return ( -
+
{this.props.children}
); } }); -module.exports = ScrollBlocker; \ No newline at end of file +module.exports = ScrollBlocker; diff --git a/package.json b/package.json index 731eb5c..536c5ed 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,11 @@ { "name": "react-scroll-components", - "version": "0.2.1", + "version": "0.2.2", "description": "A set of components that react to page scrolling", "main": "index.js", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", - "prepublish": "./node_modules/react-tools/bin/jsx -x jsx ./jsx ." + "prepublish": "./node_modules/react-tools/bin/jsx --harmony -x jsx ./jsx ." }, "repository": { "type": "git",