Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
c3-closed
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
charts
c3-closed
Commits
48e29ac5
Commit
48e29ac5
authored
Jun 12, 2014
by
Masayuki Tanaka
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update x domain when unload in load API - #342
parent
887ebcc8
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
19 deletions
+25
-19
c3.js
c3.js
+24
-19
c3.min.js
c3.min.js
+0
-0
data_load.html
htdocs/samples/data_load.html
+1
-0
No files found.
c3.js
View file @
48e29ac5
...
...
@@ -4446,27 +4446,29 @@
}
function
load
(
targets
,
args
)
{
// filter loading targets if needed
if
(
args
.
filter
)
{
targets
=
targets
.
filter
(
args
.
filter
);
}
// set type if args.types || args.type specified
if
(
args
.
type
||
args
.
types
)
{
targets
.
forEach
(
function
(
t
)
{
args
.
types
?
setTargetType
(
t
.
id
,
args
.
types
[
t
.
id
])
:
setTargetType
(
t
.
id
,
args
.
type
);
if
(
targets
)
{
// filter loading targets if needed
if
(
args
.
filter
)
{
targets
=
targets
.
filter
(
args
.
filter
);
}
// set type if args.types || args.type specified
if
(
args
.
type
||
args
.
types
)
{
targets
.
forEach
(
function
(
t
)
{
args
.
types
?
setTargetType
(
t
.
id
,
args
.
types
[
t
.
id
])
:
setTargetType
(
t
.
id
,
args
.
type
);
});
}
// Update/Add data
c3
.
data
.
targets
.
forEach
(
function
(
d
)
{
for
(
var
i
=
0
;
i
<
targets
.
length
;
i
++
)
{
if
(
d
.
id
===
targets
[
i
].
id
)
{
d
.
values
=
targets
[
i
].
values
;
targets
.
splice
(
i
,
1
);
break
;
}
}
});
c3
.
data
.
targets
=
c3
.
data
.
targets
.
concat
(
targets
);
// add remained
}
// Update/Add data
c3
.
data
.
targets
.
forEach
(
function
(
d
)
{
for
(
var
i
=
0
;
i
<
targets
.
length
;
i
++
)
{
if
(
d
.
id
===
targets
[
i
].
id
)
{
d
.
values
=
targets
[
i
].
values
;
targets
.
splice
(
i
,
1
);
break
;
}
}
});
c3
.
data
.
targets
=
c3
.
data
.
targets
.
concat
(
targets
);
// add remained
// Set targets
updateTargets
(
c3
.
data
.
targets
);
...
...
@@ -4496,6 +4498,9 @@
else
if
(
args
.
columns
)
{
load
(
convertDataToTargets
(
convertColumnsToData
(
args
.
columns
)),
args
);
}
else
{
load
(
null
,
args
);
}
}
function
unload
(
targetIds
,
done
)
{
...
...
c3.min.js
View file @
48e29ac5
This source diff could not be displayed because it is too large. You can
view the blob
instead.
htdocs/samples/data_load.html
View file @
48e29ac5
...
...
@@ -47,6 +47,7 @@
[
120
,
160
,
230
],
[
80
,
130
,
300
],
[
90
,
220
,
320
],
[
1090
,
1220
,
1320
],
]
});
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment