Browse Source

Fix conflict

pull/1069/merge
Masayuki Tanaka 10 years ago
parent
commit
f8ebb8d60d
  1. 12
      c3.js
  2. 2
      c3.min.js
  3. 12
      src/size.js

12
c3.js

@ -2613,10 +2613,16 @@
while (parent && parent.tagName !== 'BODY') {
try {
v = parent.getBoundingClientRect()[key];
if (v) {
break;
} catch(e) {
if (key === 'width') {
// In IE in certain cases getBoundingClientRect
// will cause an "unspecified error"
v = parent.offsetWidth;
}
} catch(e) {}
}
if (v) {
break;
}
parent = parent.parentNode;
}
return v;

2
c3.min.js vendored

File diff suppressed because one or more lines are too long

12
src/size.js

@ -46,10 +46,16 @@ c3_chart_internal_fn.getParentRectValue = function (key) {
while (parent && parent.tagName !== 'BODY') {
try {
v = parent.getBoundingClientRect()[key];
if (v) {
break;
} catch(e) {
if (key === 'width') {
// In IE in certain cases getBoundingClientRect
// will cause an "unspecified error"
v = parent.offsetWidth;
}
} catch(e) {}
}
if (v) {
break;
}
parent = parent.parentNode;
}
return v;

Loading…
Cancel
Save