Skip to content

Commit

Permalink
Merge pull request #659 from finos/npm-gh-fix
Browse files Browse the repository at this point in the history
Npm gh fix
  • Loading branch information
texodus authored Jul 15, 2019
2 parents 0b6dcb9 + 12fa29a commit 41493ac
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 1,229 deletions.
16 changes: 8 additions & 8 deletions docs/static/js/animation.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function select(id) {
viewer.restore(
{
"#grid": {
view: "hypergrid",
plugin: "hypergrid",
columns: ["ask", "bid", "chg"],
sort: [["name", "desc"], ["lastUpdate", "desc"]],
aggregates: {name: "last", lastUpdate: "last"},
Expand All @@ -72,36 +72,36 @@ function select(id) {
},
"#cyclone": {
columns: ["chg"],
view: "d3_x_bar",
plugin: "d3_x_bar",
sort: [["chg", "asc"]],
"row-pivots": ["name"],
"column-pivots": ["client"]
},
"#pivot": {
columns: ["vol"],
view: "d3_heatmap",
plugin: "d3_heatmap",
sort: [["vol", "asc"]],
"row-pivots": ["name"],
"column-pivots": ["client"]
},
"#crosssect": {
view: "d3_xy_scatter",
plugin: "d3_xy_scatter",
"row-pivots": ["name"],
"column-pivots": [],
columns: ["bid", "ask", "vol", "id"],
aggregates: {bid: "avg", ask: "avg", vol: "avg"},
sort: []
},
"#intersect": {
view: "d3_treemap",
plugin: "d3_treemap",
"row-pivots": ["name", "client"],
"column-pivots": [],
columns: ["bid", "chg"],
aggregates: {bid: "sum", chg: "low", name: "last"},
sort: [["name", "desc"], ["chg", "desc"]]
},
"#enhance": {
view: "d3_y_line",
plugin: "d3_y_line",
"row-pivots": [],
"column-pivots": [],
sort: [["lastUpdate", "desc"]],
Expand Down Expand Up @@ -154,13 +154,13 @@ window.addEventListener("WebComponentsReady", function() {
"row-pivots": ["Sub-Category"],
"column-pivots": ["Segment"],
columns: ["Sales"],
view: "d3_y_bar"
plugin: "d3_y_bar"
});

const psp2 = document.querySelector("#get_started perspective-viewer");
psp2.load(arrow);
psp2.restore({
view: "d3_heatmap",
plugin: "d3_heatmap",
"row-pivots": ["Sub-Category"],
"column-pivots": ["State"],
sort: [["Sales", "col asc"]],
Expand Down
2 changes: 1 addition & 1 deletion packages/perspective-viewer-hypergrid/src/js/hypergrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {bindTemplate} from "@finos/perspective-viewer/dist/esm/utils.js";
const TEMPLATE = require("../html/hypergrid.html");

import style from "../less/hypergrid.less";
import {get_type_config} from "@finos/perspective/src/js/config";
import {get_type_config} from "@finos/perspective/dist/esm/config";

const COLUMN_HEADER_FONT = "12px Helvetica, sans-serif";
const GROUP_LABEL_FONT = "12px Open Sans, sans-serif"; // overrides COLUMN_HEADER_FONT for group labels
Expand Down
4 changes: 2 additions & 2 deletions packages/perspective-webpack-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@finos/perspective-webpack-plugin",
"version": "0.3.2",
"version": "0.3.4",
"description": "Perspective.js Webpack Plugin",
"main": "index.js",
"publishConfig": {
Expand Down Expand Up @@ -31,7 +31,7 @@
"bufferutil": "~3.0.0"
},
"peerDependencies": {
"@finos/perspective": "0.3.1",
"@finos/perspective": "0.3.4",
"webpack": ">=3.5 <5"
}
}
Loading

0 comments on commit 41493ac

Please sign in to comment.