Merge branch 'DarkoKukovec-master'

5015fd86 · Masayuki Tanaka · 01aa08ac · 59ef451f · 5015fd86 · 5015fd86
Commit 5015fd86 authored Mar 14, 2015 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 8 deletions

c3.js c3.js +6 -4

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

size.js src/size.js +6 -4

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') {
-            v = parent.getBoundingClientRect()[key];
-            if (v) {
-                break;
-            }
+            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') {
-        v = parent.getBoundingClientRect()[key];
-        if (v) {
-            break;
-        }
+        try {
+            v = parent.getBoundingClientRect()[key];
+            if (v) {
+                break;
+            }
+        } catch(e) {}
        parent = parent.parentNode;
    }
    return v;