From 51673bb4bc6ef5742195ce839706edc729b6b829 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 28 Nov 2016 15:18:53 -0500 Subject: [PATCH] Added proposed changes by @mojodna, dropped react-addons-update upgraded to use immutability-helper --- app/static/app/js/Console.jsx | 2 +- app/static/app/js/components/Paginated.jsx | 7 +++---- app/static/app/js/components/ProjectListItem.jsx | 2 +- package.json | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/static/app/js/Console.jsx b/app/static/app/js/Console.jsx index 0d119691..8c488c37 100644 --- a/app/static/app/js/Console.jsx +++ b/app/static/app/js/Console.jsx @@ -2,7 +2,7 @@ import React from 'react'; import './css/Console.scss'; import './vendor/google-code-prettify/prettify'; import './vendor/google-code-prettify/prettify.css'; -import update from 'react-addons-update'; +import update from 'immutability-helper'; import Utils from './classes/Utils'; class Console extends React.Component { diff --git a/app/static/app/js/components/Paginated.jsx b/app/static/app/js/components/Paginated.jsx index 43d98391..d2eae9dc 100644 --- a/app/static/app/js/components/Paginated.jsx +++ b/app/static/app/js/components/Paginated.jsx @@ -1,9 +1,10 @@ import React from 'react'; -import update from 'react-addons-update'; +import update from 'immutability-helper'; -/*abstract*/ class Paginated extends React.Component{ +class Paginated extends React.Component{ constructor(){ super(); + this.handlePageChange = this.handlePageChange.bind(this); } updatePagination(itemsPerPage, totalItems){ @@ -23,8 +24,6 @@ import update from 'react-addons-update'; currentPage: currentPage } }); - - this.handlePageChange = this.handlePageChange.bind(this); } totalPages(itemsPerPage, totalItems){ diff --git a/app/static/app/js/components/ProjectListItem.jsx b/app/static/app/js/components/ProjectListItem.jsx index 5b191d37..fb1a550a 100644 --- a/app/static/app/js/components/ProjectListItem.jsx +++ b/app/static/app/js/components/ProjectListItem.jsx @@ -1,6 +1,6 @@ import '../css/ProjectListItem.scss'; import React from 'react'; -import update from 'react-addons-update'; +import update from 'immutability-helper'; import TaskList from './TaskList'; import EditTaskPanel from './EditTaskPanel'; import UploadProgressBar from './UploadProgressBar'; diff --git a/package.json b/package.json index 25f9b7c4..d8088f95 100644 --- a/package.json +++ b/package.json @@ -30,12 +30,12 @@ "css-loader": "^0.25.0", "extract-text-webpack-plugin": "^1.0.1", "file-loader": "^0.9.0", + "immutability-helper": "^2.0.0", "leaflet": "^1.0.1", "leaflet-measure": "^2.0.5", "node-sass": "^3.10.1", "object.values": "^1.0.3", "react": "^15.3.2", - "react-addons-update": "^15.3.2", "react-dom": "^15.3.2", "react-hot-loader": "^3.0.0-beta.5", "sass-loader": "^4.0.2",