Skip to content

C
c3-closed
Commit e4e4b6c4 authored by Masayuki Tanaka's avatar Masayuki Tanaka
Browse files
Options

Fix conflict

parents 1a8d59b6 2de3cd07
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
c3.js
View file @ e4e4b6c4
...@@ -1563,6 +1563,9 @@ ...@@ -1563,6 +1563,9 @@
for (i = 1; i < rows.length; i++) { for (i = 1; i < rows.length; i++) {
new_row = {}; new_row = {};
for (j = 0; j < rows[i].length; j++) { for (j = 0; j < rows[i].length; j++) {
if (isUndefined(rows[i][j])) {
throw new Error("Source data is missing a component at (" + i + "," + j + ")!");
}
new_row[keys[j]] = rows[i][j]; new_row[keys[j]] = rows[i][j];
} }
new_rows.push(new_row); new_rows.push(new_row);
...@@ -1577,6 +1580,9 @@ ...@@ -1577,6 +1580,9 @@
if (isUndefined(new_rows[j - 1])) { if (isUndefined(new_rows[j - 1])) {
new_rows[j - 1] = {}; new_rows[j - 1] = {};
} }
if (isUndefined(columns[i][j])) {
throw new Error("Source data is missing a component at (" + i + "," + j + ")!");
}
new_rows[j - 1][key] = columns[i][j]; new_rows[j - 1][key] = columns[i][j];
} }
} }
......
c3.min.js
View file @ e4e4b6c4
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment