Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript · SuperMap/iClient-JavaScript@17cb64f · GitHub

SuperMap / iClient-JavaScript Public

• Notifications You must be signed in to change notification settings
• Fork 288
• Star 906

• Code
• Issues 5
• Pull requests 14
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 17cb64f

Browse filesBrowse the repository at this point in the historyBrowse files

luoxiao-supermap

committed

Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

2 parents 1ceeca2 + 47ac11a commit 17cb64f
Copy full SHA for 17cb64f

4 files changed

+44-16Lines changed: 44 additions & 16 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• test
  • leaflet/overlay
    • GraphMapSpec.js
  • mapboxgl/overlay
    • GraphMapSpec.js
  • maplibregl/overlay
    • GraphMapSpec.js
  • openlayers/overlay
    • GraphMapSpec.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎test/leaflet/overlay/GraphMapSpec.js‎

Copy file name to clipboardExpand all lines: test/leaflet/overlay/GraphMapSpec.js

+11-4Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -7,17 +7,24 @@ var knowledgegraphmapURL = knowledgegraphURL + '/graphmaps/xxx图谱';
7	7
8	8	describe('GraphMap leaflet', () => {
9	9	var originalTimeout;
10		- var dom = window.document.createElement('div');
11		- dom.setAttribute('id', 'knowledgeGraph');
12		- dom.style.width = '450px';
13		- dom.style.height = '350px';
	10	+ var dom;
14	11	beforeEach(() => {
15	12	originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
16	13	jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;
17	14	});
18	15	afterEach(() => {
19	16	jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeout;
20	17	});
	18	+ beforeAll(() => {
	19	+ dom = window.document.createElement('div');
	20	+ dom.setAttribute('id', 'knowledgeGraph');
	21	+ dom.style.width = '450px';
	22	+ dom.style.height = '350px';
	23	+ window.document.body.appendChild(dom);
	24	+ });
	25	+ afterAll(() => {
	26	+ window.document.body.removeChild(dom);
	27	+ });
21	28
22	29	it('createGraphMap', (done) => {
23	30	spyOn(FetchRequest, 'get').and.callFake((testUrl) => {

Collapse file

‎test/mapboxgl/overlay/GraphMapSpec.js‎

Copy file name to clipboardExpand all lines: test/mapboxgl/overlay/GraphMapSpec.js

+11-4Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -7,10 +7,17 @@ var knowledgegraphmapURL = knowledgegraphURL + '/graphmaps/xxx图谱';
7	7
8	8	describe('GraphMap mapboxgl', () => {
9	9	var originalTimeout;
10		- var dom = window.document.createElement('div');
11		- dom.setAttribute('id', 'knowledgeGraph');
12		- dom.style.width = '450px';
13		- dom.style.height = '350px';
	10	+ var dom;
	11	+ beforeAll(() => {
	12	+ dom = window.document.createElement('div');
	13	+ dom.setAttribute('id', 'knowledgeGraph');
	14	+ dom.style.width = '450px';
	15	+ dom.style.height = '350px';
	16	+ window.document.body.appendChild(dom);
	17	+ });
	18	+ afterAll(() => {
	19	+ window.document.body.removeChild(dom);
	20	+ });
14	21	beforeEach(() => {
15	22	originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
16	23	jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;

Collapse file

‎test/maplibregl/overlay/GraphMapSpec.js‎

Copy file name to clipboardExpand all lines: test/maplibregl/overlay/GraphMapSpec.js

+11-4Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -7,10 +7,17 @@ var knowledgegraphmapURL = knowledgegraphURL + '/graphmaps/xxx图谱';
7	7
8	8	describe('GraphMap leaflet', () => {
9	9	var originalTimeout;
10		- var dom = window.document.createElement('div');
11		- dom.setAttribute('id', 'knowledgeGraph');
12		- dom.style.width = '450px';
13		- dom.style.height = '350px';
	10	+ var dom;
	11	+ beforeAll(() => {
	12	+ dom = window.document.createElement('div');
	13	+ dom.setAttribute('id', 'knowledgeGraph');
	14	+ dom.style.width = '450px';
	15	+ dom.style.height = '350px';
	16	+ window.document.body.appendChild(dom);
	17	+ });
	18	+ afterAll(() => {
	19	+ window.document.body.removeChild(dom);
	20	+ });
14	21	beforeEach(() => {
15	22	originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
16	23	jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;

Collapse file

‎test/openlayers/overlay/GraphMapSpec.js‎

Copy file name to clipboardExpand all lines: test/openlayers/overlay/GraphMapSpec.js

+11-4Lines changed: 11 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -7,10 +7,17 @@ var knowledgegraphmapURL = knowledgegraphURL + '/graphmaps/xxx图谱';
7	7
8	8	describe('GraphMap openlayers', () => {
9	9	var originalTimeout;
10		- var dom = window.document.createElement('div');
11		- dom.setAttribute('id', 'knowledgeGraph');
12		- dom.style.width = '450px';
13		- dom.style.height = '350px';
	10	+ var dom;
	11	+ beforeAll(() => {
	12	+ dom = window.document.createElement('div');
	13	+ dom.setAttribute('id', 'knowledgeGraph');
	14	+ dom.style.width = '450px';
	15	+ dom.style.height = '350px';
	16	+ window.document.body.appendChild(dom);
	17	+ });
	18	+ afterAll(() => {
	19	+ window.document.body.removeChild(dom);
	20	+ });
14	21	beforeEach(() => {
15	22	originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
16	23	jasmine.DEFAULT_TIMEOUT_INTERVAL = 50000;

0 commit comments

Comments

0 (0)