update dependencies, notably to React 15

as with every React upgrade, a round of fixing warnings will be required
etherex · Apr 8, 2016 · 782dc0b · 782dc0b
1 parent 8ab1ec7
commit 782dc0b
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 29 deletions.
diff --git a/frontend/app/components/Clipboard.jsx b/frontend/app/components/Clipboard.jsx
@@ -1,6 +1,5 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
-import assign from 'react/lib/Object.assign';
 
 function noop() {}
 
@@ -40,10 +39,6 @@ let Clipboard = React.createClass({
     document.removeEventListener("keyup", this.handleKeyUp, false);
   },
 
-  render: function() {
-    return React.createElement("textarea", assign({}, this.props, { readOnly: true, onCopy : this.handleCopy }));
-  },
-
   handleCopy : function(e) {
     this.props.onCopy(e);
   },
@@ -61,9 +56,13 @@ let Clipboard = React.createClass({
     element.select();
   },
 
-  handleKeyUp : function(e) {
+  handleKeyUp: function() {
     var element = ReactDOM.findDOMNode(this);
     element.blur();
+  },
+
+  render: function() {
+    return React.createElement("textarea", Object.assign({}, this.props, { readOnly: true, onCopy : this.handleCopy }));
   }
 
 });

diff --git a/frontend/app/components/TradeForm.jsx b/frontend/app/components/TradeForm.jsx
@@ -58,7 +58,6 @@ let TradeForm = injectIntl(React.createClass({
           <div className="visible-xs visible-sm text-center">
             <label className="sr-only" forHtml="type">{formatMessage({id:'form.buyorsell'})}</label>
             <DropdownButton id="trade-type-dropdown"
-              title="Buy or Sell"
               ref="type"
               bsStyle="primary" bsSize="small"
               className="pull-right"

diff --git a/frontend/app/components/TradeFormInstance.jsx b/frontend/app/components/TradeFormInstance.jsx
@@ -358,7 +358,7 @@ let TradeFormInstance = injectIntl(React.createClass({
     var formatMessage = this.props.intl.formatMessage;
     return (
       <form className="form-horizontal" role="form" onSubmit={this.handleValidation}>
-        <input type="hidden" ref="market" value={this.props.market.market.id} />
+        <input type="hidden" ref="market" value={this.props.market.market.id || ""} />
         <Input type="number" ref="amount" className="form-control medium" wrapperClassName="col-md-9"
           label={formatMessage({id: 'form.amount'})} labelClassName="col-md-3"
           placeholder={this.props.market.market.amountPrecision}

diff --git a/frontend/app/components/btcswap/ClaimTicket.jsx b/frontend/app/components/btcswap/ClaimTicket.jsx
@@ -105,7 +105,7 @@ let ClaimTicket = injectIntl(React.createClass({
   confirmClaim: function() {
     this.setState({
       showModal: true,
-      confirmMessage: <FormattedMessage id='btc.claim'
+      confirmMessage: <FormattedMessage id="btc.claim"
                         values={{
                           id: this.state.ticket.id,
                           amount: this.state.ticket.formattedAmount.value,

diff --git a/frontend/package.json b/frontend/package.json
@@ -28,42 +28,42 @@
   },
   "homepage": "https://github.com/etherex/etherex",
   "devDependencies": {
-    "babel-core": "^6.6.0",
+    "babel-core": "^6.7.4",
     "babel-loader": "^6.2.4",
     "babel-preset-es2015": "^6.6.0",
     "babel-preset-react": "^6.5.0",
     "css-loader": "^0.23.1",
-    "eslint": "^2.2.0",
-    "eslint-plugin-react": "^4.1.0",
-    "expect": "^1.14.0",
+    "eslint": "^2.7.0",
+    "eslint-plugin-react": "^4.3.0",
+    "expect": "^1.16.0",
     "file-loader": "^0.8.5",
-    "grunt": "^0.4.5",
+    "grunt": "^1.0.1",
     "grunt-contrib-clean": "^1.0.0",
     "grunt-contrib-jshint": "^1.0.0",
-    "grunt-contrib-watch": "^0.6.1",
+    "grunt-contrib-watch": "^1.0.0",
     "grunt-eslint": "^18.0.0",
     "grunt-gh-pages": "^1.0.0",
-    "grunt-karma": "^0.12.1",
+    "grunt-karma": "^0.12.2",
     "grunt-webpack": "^1.0.11",
     "json-loader": "^0.5.4",
-    "karma": "^0.13.21",
-    "karma-chrome-launcher": "^0.2.2",
+    "karma": "^0.13.22",
+    "karma-chrome-launcher": "^0.2.3",
     "karma-cli": "^0.1.2",
     "karma-mocha": "^0.2.2",
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^1.7.0",
-    "less": "^2.6.0",
-    "less-loader": "^2.2.2",
+    "less": "^2.6.1",
+    "less-loader": "^2.2.3",
     "mocha": "^2.4.5",
     "node-libs-browser": "^1.0.0",
     "react-hot-loader": "^1.3.0",
-    "style-loader": "^0.13.0",
+    "style-loader": "^0.13.1",
     "url-loader": "^0.5.7",
     "webpack": "^1.12.14",
     "webpack-dev-server": "^1.14.1"
   },
   "dependencies": {
-    "big-rational": "^0.10.4",
+    "big-rational": "^0.10.5",
     "bootstrap": "^3.3.6",
     "bootswatch": "^3.3.6",
     "btc-swap": "etherex/btc-swap",
@@ -74,16 +74,16 @@
     "intl": "^1.1.0",
     "intl-locales-supported": "^1.0.0",
     "keymirror": "^0.1.1",
-    "lodash": "^4.5.1",
+    "lodash": "^4.8.2",
     "numeral": "^1.5.3",
-    "react": "^0.14.7",
-    "react-addons-perf": "^0.14.7",
-    "react-addons-transition-group": "^0.14.7",
-    "react-bootstrap": "^0.28.3",
-    "react-dom": "^0.14.7",
+    "react": "^15.0.0",
+    "react-addons-perf": "^15.0.0",
+    "react-addons-transition-group": "^15.0.0",
+    "react-bootstrap": "^0.28.5",
+    "react-dom": "^15.0.0",
     "react-intl": "^2.0.0-beta2",
     "react-qr": "^0.0.2",
-    "react-router": "^2.0.0",
+    "react-router": "^2.0.1",
     "si-prefix": "^0.1.0",
     "techan": "caktux/techan.js",
     "ua-parser-js": "^0.7.10",