Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-09-15 15:32:28 +02:00
Code Issues Releases Wiki Activity

Get URLs with properties instead of getAttribute

Browse Source
This commit is contained in:
Deathamns 2015-02-10 18:22:17 +01:00
parent 2d507b3edc
commit b3a2c9c5d3
1 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/js/element-picker.js
View File

@ -137,7 +137,6 @@ var svgOcean = null;
var svgIslands = null;
var dialog = null;
var taCandidate = null;
var urlNormalizer = null;
var netFilterCandidates = [];
var cosmeticFilterCandidates = [];
@ -246,8 +245,8 @@ var netFilterFromElement = function(elem, out) {
if ( netFilterSources.hasOwnProperty(tagName) === false ) {
return;
}
var src = elem.getAttribute(netFilterSources[tagName]);
if ( typeof src !== 'string' || src.length === 0 ) {
var src = elem[netFilterSources[tagName]];
if ( src.length === 0 ) {
return;
}
// Remove fragment
@ -255,10 +254,6 @@ var netFilterFromElement = function(elem, out) {
if ( pos !== -1 ) {
src = src.slice(0, pos);
}
// Feed the attribute to a link element, then retrieve back: this
// should normalize it.
urlNormalizer.href = src;
src = urlNormalizer.href;
// Anchor absolute filter to hostname
src = src.replace(/^https?:\/\//, '||');
out.push(src);
@ -417,11 +412,7 @@ var elementsFromFilter = function(filter) {
while ( i-- ) {
elem = elems[i];
src = elem[netFilterSources[elem.tagName.toLowerCase()]];
if ( typeof src !== 'string' ) {
continue;
}
if ( src.indexOf(filter) !== -1 ) {
if ( src && src.indexOf(filter) !== -1 ) {
out.push(elem);
}
}
@ -682,8 +673,7 @@ var stopPicker = function() {
pickerRoot =
dialog =
svgOcean = svgIslands =
taCandidate =
urlNormalizer = null;
taCandidate = null;
localMessager.close();
window.focus();
@ -722,8 +712,6 @@ var startPicker = function(details) {
svgIslands = svgRoot.lastChild;
svgListening(true);
urlNormalizer = document.createElement('a');
window.addEventListener('scroll', onScrolled, true);
pickerRoot.contentWindow.addEventListener('keydown', onKeyPressed, true);
pickerRoot.contentWindow.focus();