Fix conflict

59ef451f · Masayuki Tanaka · 01aa08ac · 420172b6 · 59ef451f · 59ef451f
Commit 59ef451f authored Mar 14, 2015 by Masayuki Tanaka
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

c3.js c3.js +2 -0

c3.min.js c3.min.js +0 -0

size.js src/size.js +2 -0

No files found.
--- a/c3.js
+++ b/c3.js
@@ -2611,10 +2611,12 @@
    c3_chart_internal_fn.getParentRectValue = function (key) {
        var parent = this.selectChart.node(), v;
        while (parent && parent.tagName !== 'BODY') {
+            try {
                v = parent.getBoundingClientRect()[key];
                if (v) {
                    break;
                }
+            } catch(e) {}
            parent = parent.parentNode;
        }
        return v;

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/size.js
+++ b/src/size.js
@@ -44,10 +44,12 @@ c3_chart_internal_fn.getCurrentPaddingRight = function () {
 c3_chart_internal_fn.getParentRectValue = function (key) {
    var parent = this.selectChart.node(), v;
    while (parent && parent.tagName !== 'BODY') {
+        try {
            v = parent.getBoundingClientRect()[key];
            if (v) {
                break;
            }
+        } catch(e) {}
        parent = parent.parentNode;
    }
    return v;