debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Optimize private element hider algorithm

Browse source
This commit is contained in:
Alexander Butenko 2011-12-05 20:24:08 -04:00 committed by Christian Dywan
parent 42387e9b8b
commit 98f2e3b572
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
extensions/adblock.c
View file

@ -61,14 +61,21 @@ adblock_build_js (const gchar* private)
"function () {" "function () {"
" if (document.getElementById('madblock'))" " if (document.getElementById('madblock'))"
" return;" " return;"
" var URL = location.href;" // Get just domain name from URL
" var URL = location.href.match(/:\\/\\/(.[^/]+)/)[1];"
" var sites = new Array(); %s;" " var sites = new Array(); %s;"
" var public = '.madblockplaceholder ';" " var public = '.madblockplaceholder ';"
" for (var i in sites) {" // Split domain into subdomain parts
" if (URL.indexOf(i) != -1 && sites[i] ){" " var subdomains = URL.split ('.');"
" public += ', .'+sites[i];" " var hostname = subdomains [subdomains.length - 1];"
" break;" " var i = subdomains.length - 2;"
" }}" // Check if any of subdomains do have blocking rules
" while (i >= 0) {"
" hostname = subdomains [i] + '.' + hostname;"
" if (sites [hostname])"
" public += ', ' + sites [hostname];"
" i--;"
" }"
" public += ' {display: none !important}';" " public += ' {display: none !important}';"
" var mystyle = document.createElement('style');" " var mystyle = document.createElement('style');"
" mystyle.setAttribute('type', 'text/css');" " mystyle.setAttribute('type', 'text/css');"
@ -1218,8 +1225,17 @@ adblock_frame_add_private (const gchar* line,
domains = g_strsplit (data[0], ",", -1); domains = g_strsplit (data[0], ",", -1);
for (i = 0; domains[i]; i++) for (i = 0; domains[i]; i++)
{ {
gchar* domain;
domain = domains[i];
/* Ignore Firefox-specific option */
if (!g_strcmp0 (domain, "~pregecko2"))
continue;
/* strip ~ from domain */
if (domain[0] == '~')
domain++;
g_string_append_printf (blockcssprivate, ";sites['%s']+=',%s'", g_string_append_printf (blockcssprivate, ";sites['%s']+=',%s'",
g_strstrip (domains[i]), data[1]); g_strstrip (domain), data[1]);
} }
g_strfreev (domains); g_strfreev (domains);
} }