Skip to content

Commit

Permalink
#130 updated viewer lib, scripts, styles and code to v0.3.7
Browse files Browse the repository at this point in the history
see https://github.com/finos/perspective/blob/master/CHANGELOG.md for updated features and fixes in that lib release
  • Loading branch information
RandomFractals committed Aug 20, 2019
1 parent 8046178 commit 1db0040
Show file tree
Hide file tree
Showing 17 changed files with 202 additions and 192 deletions.
314 changes: 157 additions & 157 deletions package-lock.json

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -362,11 +362,11 @@
"vscode": "^1.1.36"
},
"dependencies": {
"@finos/perspective": "^0.3.1",
"@finos/perspective-viewer": "^0.3.1",
"@finos/perspective-viewer-d3fc": "^0.3.1",
"@finos/perspective-viewer-highcharts": "^0.3.1",
"@finos/perspective-viewer-hypergrid": "^0.3.1",
"@finos/perspective": "^0.3.7",
"@finos/perspective-viewer": "^0.3.7",
"@finos/perspective-viewer-d3fc": "^0.3.7",
"@finos/perspective-viewer-highcharts": "^0.3.7",
"@finos/perspective-viewer-hypergrid": "^0.3.7",
"apache-arrow": "^0.14.1",
"avsc": "^5.4.13",
"hjson": "^3.1.2",
Expand Down
2 changes: 0 additions & 2 deletions scripts/d3fc.plugin.js

This file was deleted.

2 changes: 0 additions & 2 deletions scripts/highcharts.plugin.js

This file was deleted.

2 changes: 0 additions & 2 deletions scripts/hypergrid.plugin.js

This file was deleted.

2 changes: 2 additions & 0 deletions scripts/perspective-viewer-d3fc.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions scripts/perspective-viewer-highcharts.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions scripts/perspective-viewer-hypergrid.js

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions scripts/perspective-viewer.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion scripts/perspective.js

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions scripts/perspective.view.js

This file was deleted.

8 changes: 4 additions & 4 deletions scripts/perspective.wasm.worker.js

Large diffs are not rendered by default.

Binary file modified scripts/psp.async.wasm
Binary file not shown.
14 changes: 9 additions & 5 deletions src/data.preview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,15 @@ export class DataPreview {
this._previewUri = this._uri.with({scheme: 'data'});
this._title = `${this._fileName}`;

// initilize charts plugin
this._charts = this.charts;
if (viewConfig && viewConfig.hasOwnProperty('view') && viewConfig.view.startsWith('d3')) {
// reset it to highcharts for older ext v.s configs
this._charts = 'highcharts';
// patch view config
if (viewConfig && viewConfig.hasOwnProperty('view')) {
viewConfig['plugin'] = viewConfig['view'];
// initilize charts plugin
this._charts = this.charts;
if (viewConfig.view !== 'hypergrid' && !viewConfig.view.startsWith('d3')) {
// reset it to highcharts for older ext v.s configs
this._charts = 'highcharts';
}
}

// initialize data preview logger
Expand Down
3 changes: 3 additions & 0 deletions styles/perspective-viewer/material.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 11 additions & 8 deletions styles/perspective-viewer/material.dark.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions templates/data.view.html
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
<title>Data Preview</title>
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
<script src="{scripts}/perspective.js"></script>
<script src="https://unpkg.com/@finos/[email protected].1/build/perspective.view.js"></script>
<script src="{scripts}/hypergrid.plugin.js"></script>
<script src="{scripts}/{charts}.plugin.js"></script>
<link rel="stylesheet" href="https://unpkg.com/@finos/[email protected].1/build/material{theme}.css">
<script src="https://unpkg.com/@finos/[email protected].7/dist/umd/perspective-viewer.js"></script>
<script src="{scripts}/perspective-viewer-hypergrid.js"></script>
<script src="{scripts}/perspective-viewer-{charts}.js"></script>
<link rel="stylesheet" href="https://unpkg.com/@finos/[email protected].7/dist/umd/material{theme}.css">
<style>
body {
margin: 0px;
Expand Down

0 comments on commit 1db0040

Please sign in to comment.