Merge branch 'master' of github.com:gorhill/uBlock

nicole-ashley · Mar 2, 2017 · 40c6947 · 40c6947
2 parents 0c80411 + a121f22
commit 40c6947
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/js/scriptlets/dom-inspector.js b/src/js/scriptlets/dom-inspector.js
@@ -810,6 +810,17 @@ var elementsFromSpecialSelector = function(selector) {
 
 /******************************************************************************/
 
+var getSvgRootChildren = function() {
+    if ( svgRoot.children ) {
+        return svgRoot.children;
+    } else {
+        var childNodes = Array.prototype.slice.apply(svgRoot.childNodes);
+        return childNodes.filter(function(node) {
+            return node.nodeType === Node.ELEMENT_NODE;
+        });
+    }
+};
+
 var highlightElements = function(scrollTo) {
     var wv = pickerRoot.contentWindow.innerWidth;
     var hv = pickerRoot.contentWindow.innerHeight;
@@ -818,6 +829,7 @@ var highlightElements = function(scrollTo) {
     var xl, xr, yt, yb, w, h, ws;
     var xlu = Number.MAX_VALUE, xru = 0, ytu = Number.MAX_VALUE, ybu = 0;
     var lists = highlightedElementLists;
+    var svgRootChildren = getSvgRootChildren();
 
     for ( var i = 0; i < lists.length; i++ ) {
         elems = lists[i];
@@ -857,7 +869,7 @@ var highlightElements = function(scrollTo) {
             if ( yt < ytu ) { ytu = yt; }
             if ( yb > ybu ) { ybu = yb; }
         }
-        svgRoot.children[i+1].setAttribute('d', islands.join('') || 'M0 0');
+        svgRootChildren[i+1].setAttribute('d', islands.join('') || 'M0 0');
     }
 
     svgRoot.firstElementChild.setAttribute('d', ocean.join(''));