Mirrors
/
uBlock
mirror of https://github.com/gorhill/uBlock.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
gorhill 2017-03-02 12:50:06 -05:00
parent 0c804116a8 a121f2261d
commit 40c6947c68
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/js/scriptlets/dom-inspector.js
View File

@ -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 highlightElements = function(scrollTo) {
var wv = pickerRoot.contentWindow.innerWidth; var wv = pickerRoot.contentWindow.innerWidth;
var hv = pickerRoot.contentWindow.innerHeight; var hv = pickerRoot.contentWindow.innerHeight;
@ -818,6 +829,7 @@ var highlightElements = function(scrollTo) {
var xl, xr, yt, yb, w, h, ws; var xl, xr, yt, yb, w, h, ws;
var xlu = Number.MAX_VALUE, xru = 0, ytu = Number.MAX_VALUE, ybu = 0; var xlu = Number.MAX_VALUE, xru = 0, ytu = Number.MAX_VALUE, ybu = 0;
var lists = highlightedElementLists; var lists = highlightedElementLists;
var svgRootChildren = getSvgRootChildren();
for ( var i = 0; i < lists.length; i++ ) { for ( var i = 0; i < lists.length; i++ ) {
elems = lists[i]; elems = lists[i];
@ -857,7 +869,7 @@ var highlightElements = function(scrollTo) {
if ( yt < ytu ) { ytu = yt; } if ( yt < ytu ) { ytu = yt; }
if ( yb > ybu ) { ybu = yb; } 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('')); svgRoot.firstElementChild.setAttribute('d', ocean.join(''));