From: Stephen Habegger <qshobbes@live.com>
Date: Mon, 16 Jun 2014 12:38:48 +0000 (-0500)
Subject: Fixed Infinite Loop
X-Git-Tag: 1.0.0~4^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e683b0c833f489f1ff000f1dd5159e4cad76e596;p=svg.js.git

Fixed Infinite Loop

Fixed infinite loop in ViewBox when element has a percentage
width/height.
---

diff --git a/src/viewbox.js b/src/viewbox.js
index aec60a3..5f13c3e 100755
--- a/src/viewbox.js
+++ b/src/viewbox.js
@@ -5,6 +5,8 @@ SVG.ViewBox = function(element) {
     , hm   = 1 /* height multiplier */
     , box  = element.bbox()
     , view = (element.attr('viewBox') || '').match(/-?[\d\.]+/g)
+    , wElement = element
+    , hElement = element
 
   /* get dimensions of current node */
   width  = new SVG.Number(element.width())
@@ -13,11 +15,13 @@ SVG.ViewBox = function(element) {
   /* find nearest non-percentual dimensions */
   while (width.unit == '%') {
     wm *= width.value
-    width = new SVG.Number(element instanceof SVG.Doc ? element.parent.offsetWidth : element.width())
+    width = new SVG.Number(wElement instanceof SVG.Doc ? wElement.parent.offsetWidth : wElement.parent.width())
+    wElement = wElement.parent
   }
   while (height.unit == '%') {
     hm *= height.value
-    height = new SVG.Number(element instanceof SVG.Doc ? element.parent.offsetHeight : element.height())
+    height = new SVG.Number(hElement instanceof SVG.Doc ? hElement.parent.offsetHeight : hElement.parent.height())
+    hElement = hElement.parent
   }
   
   /* ensure defaults */