Fix conflict

f8ebb8d6 · Masayuki Tanaka · 5015fd86 · c41deabd · f8ebb8d6 · f8ebb8d6
Commit f8ebb8d6 authored Mar 14, 2015 by Masayuki Tanaka
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 6 deletions

c3.js c3.js +9 -3

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

size.js src/size.js +9 -3

No files found.
--- a/c3.js
+++ b/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;

--- a/c3.min.js
+++ b/c3.min.js
--- a/src/size.js
+++ b/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;