Add viewport locators slightly more efficiently.

jeremyBanks · Jul 20, 2012 · 5365f27 · 5365f27
1 parent 166cdb9
commit 5365f27
Showing 1 changed file with 14 additions and 23 deletions.
diff --git a/js/svg-helper.js b/js/svg-helper.js
@@ -343,34 +343,25 @@ SVGHelper.prototype._getProportionalBBoxOf = function( childEl ) {
 SVGHelper.prototype._addViewportLocatorsFor = function( childEls ) {
   var viewPorts = [];
 
-  // TODO: be more efficient. Stop searching up as soon as there's an
-  // already-locatored viewPort, etc.
-
-  var i, l, e, parentView;
+  var i, l, e, viewPort;
   for ( i = 0, l = childEls.length; i < l; ++i ) {
-    for ( parentView = childEls[ i ].viewportElement; parentView; parentView = parentView.viewportElement ) {
-      if ( viewPorts.indexOf( parentView ) === -1 ) {
-        viewPorts.push( parentView );
+    for ( viewPort = childEls[ i ].viewportElement; viewPort; viewPort = viewPort.viewportElement ) {
+      if ( !viewPort.querySelector( ".SVGHelper-viewportLocator" ) ) {
+        var filler = document.createElementNS( NS_SVG, "rect" );
+        filler.setAttribute( "class", "SVGHelper-viewportLocator" );
+        filler.setAttribute( "x", 0 );
+        filler.setAttribute( "y", 0 );
+        filler.setAttribute( "width", "100%" );
+        filler.setAttribute( "height", "100%" );
+        filler.setAttribute( "fill", "none" );
+        filler.setAttribute( "stroke", "none" );
+        viewPort.appendChild( filler );
+      } else {
+        break;
       }
     }
   }
 
-  for ( i = 0, l = viewPorts.length; i < l; ++i ) {
-    e = viewPorts[ i ];
-
-    if ( !e.querySelector( ".SVGHelper-viewportLocator" ) ) {
-      var filler = document.createElementNS( NS_SVG, "rect" );
-      filler.setAttribute( "class", "SVGHelper-viewportLocator" );
-      filler.setAttribute( "x", 0 );
-      filler.setAttribute( "y", 0 );
-      filler.setAttribute( "width", "100%" );
-      filler.setAttribute( "height", "100%" );
-      filler.setAttribute( "fill", "none" );
-      filler.setAttribute( "stroke", "none" );
-      e.appendChild( filler );
-    }
-  }
-
   return this;
 };