Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dagre-d3 require issue #359

Merged
merged 10 commits into from
Apr 4, 2018
Merged

Fix dagre-d3 require issue #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a2aaebb
update IP to new node
daming-lu Apr 2, 2018
d9aec25
Merge remote-tracking branch 'upstream/develop' into develop
daming-lu Apr 2, 2018
c8ff8a4
Merge remote-tracking branch 'upstream/develop' into develop
daming-lu Apr 3, 2018
a5caed5
Merge remote-tracking branch 'upstream/develop' into develop
daming-lu Apr 4, 2018
19b02e8
add dagre-d3 manually to prevent npm install bug about 'require'
daming-lu Apr 4, 2018
5e7e48b
format
daming-lu Apr 4, 2018
dadfccc
update clang-format to 7.0.0 and run it
daming-lu Apr 4, 2018
e433c2c
update 3.8
daming-lu Apr 4, 2018
70c9bd6
remove big lib file and add it via extern in webpack
daming-lu Apr 4, 2018
acf00cd
rm comment
daming-lu Apr 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"d3": "^4.7.4",
"d3-format": "^1.2.1",
"dagre": "^0.8.2",
"dagre-d3": "^0.6.1",
"echarts": "^4.0.0",
"echarts-gl": "^1.1.0",
"file-saver": "^1.3.3",
Expand Down
1 change: 0 additions & 1 deletion frontend/src/graph/ui/Chart.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
// for d3 drawing
import * as d3 from "d3";
import * as dagre from "dagre";
import * as dagreD3 from 'dagre-d3';

export default {
props: ['fitScreen', 'download', 'scale', 'curNode'],
Expand Down
1 change: 1 addition & 0 deletions frontend/template/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=Edge">
<link href='https://fonts.googleapis.com/css?family=Roboto:300,400,500,700|Material+Icons' rel="stylesheet">
<script src="https://dagrejs.github.io/project/dagre-d3/latest/dagre-d3.min.js"></script>
</head>
<body>
<div id="root"></div>
Expand Down
5 changes: 4 additions & 1 deletion frontend/tool/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,10 @@ const config = {
test: /\.(styl)$/
}),
new ExtractTextPlugin({filename: '[name].css'})
]
],
externals: {
dagreD3: 'dagre-d3'
}
};

// template config
Expand Down
4 changes: 2 additions & 2 deletions visualdl/logic/sdk.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,8 +440,8 @@ struct Audio {
};

/*
* Audio reader.
*/
* Audio reader.
*/
struct AudioReader {
using value_t = typename Audio::value_t;

Expand Down