From 658a38f40a2649b6170dfd6929649423ec3e5801 Mon Sep 17 00:00:00 2001 From: David Kaltschmidt Date: Tue, 15 Mar 2016 13:36:53 +0100 Subject: [PATCH] Upgrade npm app dependencies --- client/app/scripts/charts/edge.js | 2 +- client/app/scripts/charts/node.js | 2 +- .../node-details/node-details-table.js | 2 +- client/app/scripts/stores/app-store.js | 2 +- client/package.json | 22 +++++++++---------- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/client/app/scripts/charts/edge.js b/client/app/scripts/charts/edge.js index 665bee48f..a2f51e895 100644 --- a/client/app/scripts/charts/edge.js +++ b/client/app/scripts/charts/edge.js @@ -10,7 +10,7 @@ const line = d3.svg.line() .x(function(d) { return d.x; }) .y(function(d) { return d.y; }); -const animConfig = [80, 20];// stiffness, bounce +const animConfig = {stiffness: 80, damping: 20}; const flattenPoints = function(points) { const flattened = {}; diff --git a/client/app/scripts/charts/node.js b/client/app/scripts/charts/node.js index 3413f2395..43be88313 100644 --- a/client/app/scripts/charts/node.js +++ b/client/app/scripts/charts/node.js @@ -62,7 +62,7 @@ export default class Node extends React.Component { const onMouseLeave = this.handleMouseLeave; const onMouseClick = this.handleMouseClick; const classNames = ['node']; - const animConfig = [80, 20]; // stiffness, bounce + const animConfig = {stiffness: 80, damping: 20}; const label = this.ellipsis(props.label, 14, nodeScale(4 * scaleFactor)); const subLabel = this.ellipsis(props.subLabel, 12, nodeScale(4 * scaleFactor)); let labelFontSize = 14; diff --git a/client/app/scripts/components/node-details/node-details-table.js b/client/app/scripts/components/node-details/node-details-table.js index 82303eb58..ca259f017 100644 --- a/client/app/scripts/components/node-details/node-details-table.js +++ b/client/app/scripts/components/node-details/node-details-table.js @@ -145,7 +145,7 @@ export default class NodeDetailsTable extends React.Component { render() { const headers = this.renderHeaders(); - let nodes = _.sortByAll(this.props.nodes, this.getValueForSortBy, 'label', this.getMetaDataSorters()); + let nodes = _.sortBy(this.props.nodes, this.getValueForSortBy, 'label', this.getMetaDataSorters()); const limited = nodes && this.state.limit > 0 && nodes.length > this.state.limit; const expanded = this.state.limit === 0; const notShown = nodes.length - this.DEFAULT_LIMIT; diff --git a/client/app/scripts/stores/app-store.js b/client/app/scripts/stores/app-store.js index 0bfea9c21..20edade72 100644 --- a/client/app/scripts/stores/app-store.js +++ b/client/app/scripts/stores/app-store.js @@ -537,7 +537,7 @@ export class AppStore extends Store { if (mouseOverNodeId === nodeId) { mouseOverNodeId = null; } - if (nodes.has(nodeId) && _.contains(mouseOverEdgeId, nodeId)) { + if (nodes.has(nodeId) && _.includes(mouseOverEdgeId, nodeId)) { mouseOverEdgeId = null; } nodes = nodes.delete(nodeId); diff --git a/client/package.json b/client/package.json index 9e2e2bf66..bc69d7cc0 100644 --- a/client/package.json +++ b/client/package.json @@ -10,21 +10,21 @@ "d3": "~3.5.5", "dagre": "0.7.4", "debug": "~2.2.0", - "filesize": "3.1.4", + "filesize": "3.2.1", "flux": "2.1.1", - "font-awesome": "4.4.0", + "font-awesome": "4.5.0", "font-awesome-webpack": "0.0.4", "immutable": "~3.7.4", - "lodash": "~3.10.1", - "materialize-css": "0.97.2", + "lodash": "~4.6.1", + "materialize-css": "0.97.5", "moment": "2.12.0", - "page": "1.6.4", - "react": "0.14.3", - "react-addons-pure-render-mixin": "0.14.3", - "react-addons-transition-group": "0.14.3", - "react-addons-update": "0.14.3", - "react-dom": "0.14.3", - "react-motion": "0.3.1", + "page": "1.7.0", + "react": "^0.14.7", + "react-addons-pure-render-mixin": "^0.14.7", + "react-addons-transition-group": "^0.14.7", + "react-addons-update": "^0.14.7", + "react-dom": "^0.14.7", + "react-motion": "0.4.2", "reqwest": "~2.0.5", "timely": "0.1.0" },